summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2013-11-07 18:09:32 +0100
committerMatthias Schiffer <mschiffer@universe-factory.net>2013-11-07 18:09:32 +0100
commit2fb08c6455bf6f08209b5993c755c1135611813b (patch)
treef604b15b0d84cafb37684cacad4dd4d74ab2d8c6
parentd971fce38b72c935b58e149ab1f8eb92202e76db (diff)
downloadfastd-2fb08c6455bf6f08209b5993c755c1135611813b.tar
fastd-2fb08c6455bf6f08209b5993c755c1135611813b.zip
CMake: add LINK_LIBRARIES workaround for old CMake versions
-rw-r--r--cmake/fastd_module.cmake2
-rw-r--r--src/crypto/cipher/CMakeLists.txt4
-rw-r--r--src/crypto/mac/CMakeLists.txt4
-rw-r--r--src/methods/CMakeLists.txt3
4 files changed, 10 insertions, 3 deletions
diff --git a/cmake/fastd_module.cmake b/cmake/fastd_module.cmake
index 83e68d0..26285ae 100644
--- a/cmake/fastd_module.cmake
+++ b/cmake/fastd_module.cmake
@@ -15,7 +15,7 @@ function(fastd_module type enabled_var info name)
add_library(${type}_${name_} STATIC ${ARGN})
set_property(TARGET ${type}_${name_} PROPERTY COMPILE_FLAGS "${FASTD_CFLAGS}")
- set_property(TARGET ${type}s APPEND PROPERTY LINK_LIBRARIES ${type}_${name_})
+ set_property(TARGET ${type}s APPEND PROPERTY FASTD_LINK_LIBRARIES ${type}_${name_})
list(APPEND ${TYPE}S ${name_})
diff --git a/src/crypto/cipher/CMakeLists.txt b/src/crypto/cipher/CMakeLists.txt
index 3c9b342..bda5cba 100644
--- a/src/crypto/cipher/CMakeLists.txt
+++ b/src/crypto/cipher/CMakeLists.txt
@@ -59,7 +59,9 @@ foreach(cipher ${CIPHERS})
endforeach(impl)
set(CIPHER_IMPLS "${CIPHER_IMPLS}NULL};")
-
endforeach(cipher)
+get_property(LIBS TARGET ciphers PROPERTY FASTD_LINK_LIBRARIES)
+target_link_libraries(ciphers ${LIBS})
+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ciphers.c.in ${CMAKE_CURRENT_BINARY_DIR}/ciphers.c)
diff --git a/src/crypto/mac/CMakeLists.txt b/src/crypto/mac/CMakeLists.txt
index fe13ace..ca3b71d 100644
--- a/src/crypto/mac/CMakeLists.txt
+++ b/src/crypto/mac/CMakeLists.txt
@@ -58,7 +58,9 @@ foreach(mac ${MACS})
endforeach(impl)
set(MAC_IMPLS "${MAC_IMPLS}NULL};")
-
endforeach(mac)
+get_property(LIBS TARGET macs PROPERTY FASTD_LINK_LIBRARIES)
+target_link_libraries(macs ${LIBS})
+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/macs.c.in ${CMAKE_CURRENT_BINARY_DIR}/macs.c)
diff --git a/src/methods/CMakeLists.txt b/src/methods/CMakeLists.txt
index 3d1e2e2..e515b32 100644
--- a/src/methods/CMakeLists.txt
+++ b/src/methods/CMakeLists.txt
@@ -38,4 +38,7 @@ foreach(method ${METHODS})
set(METHOD_LIST "${METHOD_LIST}\n&fastd_method_${method_},")
endforeach(method)
+get_property(LIBS TARGET methods PROPERTY FASTD_LINK_LIBRARIES)
+target_link_libraries(methods ${LIBS})
+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/methods.c.in ${CMAKE_CURRENT_BINARY_DIR}/methods.c)