kfr

commit 0fdac364877da935c9851e9a1f78a8a5dbb52822
parent 722fb25bb8f7b83d9134b0ea2fb44b466b855673
Author: [email protected] <[email protected]>
Date:   Fri, 26 Jan 2024 13:37:28 +0000

CMake config tweaks and fixes

Diffstat:
M
CMakeLists.txt
 | 
15
++++++++++-----
M
src/capi/CMakeLists.txt
 | 
6
+++---
M
src/dft/CMakeLists.txt
 | 
6
+++---
M
src/dsp/CMakeLists.txt
 | 
6
+++---
M
src/io/CMakeLists.txt
 | 
6
+++---

5 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -394,7 +394,9 @@ append_defines_from(kfr_io)
 
 string(REPLACE "=" " " kfr_defines "${kfr_defines}")
 string(REPLACE ";" "\n#define " kfr_defines "${kfr_defines}")
-set(kfr_defines "#define ${kfr_defines}\n")
+if (kfr_defines)
+    set(kfr_defines "#define ${kfr_defines}\n")
+endif ()
 
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/kfr_config.h "${kfr_defines}")
 
@@ -438,10 +440,13 @@ install(TARGETS kfr EXPORT kfr_export)
 install(
     EXPORT kfr_export
     DESTINATION "${KFR_INSTALL_CMAKEDIR}"
+    CONFIGURATIONS Debug Release
     FILE KFRConfig.cmake)
 
-# write_basic_package_version_file( KFRConfigVersion.cmake VERSION
-# ${KFR_VERSION} COMPATIBILITY SameMajorVersion)
+write_basic_package_version_file(KFRConfigVersion.cmake
+    VERSION ${KFR_VERSION} 
+    COMPATIBILITY SameMinorVersion)
 
-# install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KFRConfigVersion.cmake" DESTINATION
-# "${KFR_INSTALL_CMAKEDIR}" )
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KFRConfigVersion.cmake"
+    DESTINATION
+    "${KFR_INSTALL_CMAKEDIR}" )
diff --git a/src/capi/CMakeLists.txt b/src/capi/CMakeLists.txt
@@ -50,9 +50,9 @@ if (KFR_INSTALL_LIBRARIES)
         install(
             TARGETS kfr_capi
             EXPORT kfr_export
-            ARCHIVE DESTINATION lib
-            LIBRARY DESTINATION lib
-            RUNTIME DESTINATION bin
+            ARCHIVE DESTINATION lib$<$<CONFIG:Debug>:/debug>
+            LIBRARY DESTINATION lib$<$<CONFIG:Debug>:/debug>
+            RUNTIME DESTINATION bin$<$<CONFIG:Debug>:/debug>
             )
     endif ()
 endif ()
diff --git a/src/dft/CMakeLists.txt b/src/dft/CMakeLists.txt
@@ -19,7 +19,7 @@ if (KFR_INSTALL_LIBRARIES)
     install(
         TARGETS ${kfr_dft_TARGETS}
         EXPORT kfr_export
-        ARCHIVE DESTINATION lib
-        LIBRARY DESTINATION lib
-        RUNTIME DESTINATION bin)
+        ARCHIVE DESTINATION lib$<$<CONFIG:Debug>:/debug>
+        LIBRARY DESTINATION lib$<$<CONFIG:Debug>:/debug>
+        RUNTIME DESTINATION bin$<$<CONFIG:Debug>:/debug>)
 endif ()
diff --git a/src/dsp/CMakeLists.txt b/src/dsp/CMakeLists.txt
@@ -6,7 +6,7 @@ if (KFR_INSTALL_LIBRARIES)
     install(
         TARGETS ${kfr_dsp_TARGETS}
         EXPORT kfr_export
-        ARCHIVE DESTINATION lib
-        LIBRARY DESTINATION lib
-        RUNTIME DESTINATION bin)
+        ARCHIVE DESTINATION lib$<$<CONFIG:Debug>:/debug>
+        LIBRARY DESTINATION lib$<$<CONFIG:Debug>:/debug>
+        RUNTIME DESTINATION bin$<$<CONFIG:Debug>:/debug>)
 endif ()
diff --git a/src/io/CMakeLists.txt b/src/io/CMakeLists.txt
@@ -6,7 +6,7 @@ if (KFR_INSTALL_LIBRARIES)
     install(
         TARGETS kfr_io
         EXPORT kfr_export
-        ARCHIVE DESTINATION lib
-        LIBRARY DESTINATION lib
-        RUNTIME DESTINATION bin)
+        ARCHIVE DESTINATION lib$<$<CONFIG:Debug>:/debug>
+        LIBRARY DESTINATION lib$<$<CONFIG:Debug>:/debug>
+        RUNTIME DESTINATION bin$<$<CONFIG:Debug>:/debug>)
 endif ()