cmake: fix monolithic test build

diff --git a/winpr/libwinpr/asn1/test/CMakeLists.txt b/winpr/libwinpr/asn1/test/CMakeLists.txt
index 3ff2010..eb22ea5 100644 (file)
--- a/winpr/libwinpr/asn1/test/CMakeLists.txt
+++ b/winpr/libwinpr/asn1/test/CMakeLists.txt
@@ -24,7 +24,12 @@ create_test_sourcelist(${MODULE_PREFIX}_SRCS
 
 add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
-target_link_libraries(${MODULE_NAME} winpr-asn1)
+set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
+       MONOLITHIC ${MONOLITHIC_BUILD}
+       MODULE winpr
+       MODULES winpr-asn1)
+
+target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
 foreach(test ${${MODULE_PREFIX}_TESTS})
        get_filename_component(TestName ${test} NAME_WE)

diff --git a/winpr/libwinpr/crt/test/CMakeLists.txt b/winpr/libwinpr/crt/test/CMakeLists.txt
index b665249..d32a33b 100644 (file)
--- a/winpr/libwinpr/crt/test/CMakeLists.txt
+++ b/winpr/libwinpr/crt/test/CMakeLists.txt
@@ -13,9 +13,12 @@ create_test_sourcelist(${MODULE_PREFIX}_SRCS
 
 add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
-if(NOT WIN32)
-       target_link_libraries(${MODULE_NAME} winpr-crt)
-endif()
+set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
+       MONOLITHIC ${MONOLITHIC_BUILD}
+       MODULE winpr
+       MODULES winpr-crt)
+
+target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
 foreach(test ${${MODULE_PREFIX}_TESTS})
        get_filename_component(TestName ${test} NAME_WE)

diff --git a/winpr/libwinpr/file/test/CMakeLists.txt b/winpr/libwinpr/file/test/CMakeLists.txt
index 80371dc..1bb5373 100644 (file)
--- a/winpr/libwinpr/file/test/CMakeLists.txt
+++ b/winpr/libwinpr/file/test/CMakeLists.txt
@@ -16,9 +16,12 @@ create_test_sourcelist(${MODULE_PREFIX}_SRCS
 
 add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
-if(NOT WIN32)
-       target_link_libraries(${MODULE_NAME} winpr-file)
-endif()
+set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
+       MONOLITHIC ${MONOLITHIC_BUILD}
+       MODULE winpr
+       MODULES winpr-file)
+
+target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
 foreach(test ${${MODULE_PREFIX}_TESTS})
        get_filename_component(TestName ${test} NAME_WE)

diff --git a/winpr/libwinpr/interlocked/test/CMakeLists.txt b/winpr/libwinpr/interlocked/test/CMakeLists.txt
index c55804f..c948dca 100644 (file)
--- a/winpr/libwinpr/interlocked/test/CMakeLists.txt
+++ b/winpr/libwinpr/interlocked/test/CMakeLists.txt
@@ -15,7 +15,12 @@ create_test_sourcelist(${MODULE_PREFIX}_SRCS
 
 add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
-target_link_libraries(${MODULE_NAME} winpr-interlocked)
+set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
+       MONOLITHIC ${MONOLITHIC_BUILD}
+       MODULE winpr
+       MODULES winpr-interlocked)
+
+target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
 foreach(test ${${MODULE_PREFIX}_TESTS})
        get_filename_component(TestName ${test} NAME_WE)

diff --git a/winpr/libwinpr/io/test/CMakeLists.txt b/winpr/libwinpr/io/test/CMakeLists.txt
index 6119501..b83f0af 100644 (file)
--- a/winpr/libwinpr/io/test/CMakeLists.txt
+++ b/winpr/libwinpr/io/test/CMakeLists.txt
@@ -13,9 +13,12 @@ create_test_sourcelist(${MODULE_PREFIX}_SRCS
 
 add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
-if(NOT WIN32)
-       target_link_libraries(${MODULE_NAME} winpr-io)
-endif()
+set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
+       MONOLITHIC ${MONOLITHIC_BUILD}
+       MODULE winpr
+       MODULES winpr-io)
+
+target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
 foreach(test ${${MODULE_PREFIX}_TESTS})
        get_filename_component(TestName ${test} NAME_WE)

diff --git a/winpr/libwinpr/library/test/CMakeLists.txt b/winpr/libwinpr/library/test/CMakeLists.txt
index 9096ddc..b77e856 100644 (file)
--- a/winpr/libwinpr/library/test/CMakeLists.txt
+++ b/winpr/libwinpr/library/test/CMakeLists.txt
@@ -18,7 +18,12 @@ create_test_sourcelist(${MODULE_PREFIX}_SRCS
 
 add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
-target_link_libraries(${MODULE_NAME} winpr-library winpr-path)
+set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
+       MONOLITHIC ${MONOLITHIC_BUILD}
+       MODULE winpr
+       MODULES winpr-library winpr-path)
+
+target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
 foreach(test ${${MODULE_PREFIX}_TESTS})
        get_filename_component(TestName ${test} NAME_WE)

diff --git a/winpr/libwinpr/path/test/CMakeLists.txt b/winpr/libwinpr/path/test/CMakeLists.txt
index e3a8e41..9141c75 100644 (file)
--- a/winpr/libwinpr/path/test/CMakeLists.txt
+++ b/winpr/libwinpr/path/test/CMakeLists.txt
@@ -34,7 +34,12 @@ create_test_sourcelist(${MODULE_PREFIX}_SRCS
 
 add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
-target_link_libraries(${MODULE_NAME} winpr-path)
+set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
+       MONOLITHIC ${MONOLITHIC_BUILD}
+       MODULE winpr
+       MODULES winpr-path)
+
+target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
 foreach(test ${${MODULE_PREFIX}_TESTS})
        get_filename_component(TestName ${test} NAME_WE)

diff --git a/winpr/libwinpr/pipe/test/CMakeLists.txt b/winpr/libwinpr/pipe/test/CMakeLists.txt
index 9122159..29ca05a 100644 (file)
--- a/winpr/libwinpr/pipe/test/CMakeLists.txt
+++ b/winpr/libwinpr/pipe/test/CMakeLists.txt
@@ -13,7 +13,12 @@ create_test_sourcelist(${MODULE_PREFIX}_SRCS
 
 add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
-target_link_libraries(${MODULE_NAME} winpr-pipe)
+set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
+       MONOLITHIC ${MONOLITHIC_BUILD}
+       MODULE winpr
+       MODULES winpr-pipe)
+
+target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
 foreach(test ${${MODULE_PREFIX}_TESTS})
        get_filename_component(TestName ${test} NAME_WE)

diff --git a/winpr/libwinpr/sspi/test/CMakeLists.txt b/winpr/libwinpr/sspi/test/CMakeLists.txt
index 5b8f959..453352f 100644 (file)
--- a/winpr/libwinpr/sspi/test/CMakeLists.txt
+++ b/winpr/libwinpr/sspi/test/CMakeLists.txt
@@ -17,10 +17,15 @@ create_test_sourcelist(${MODULE_PREFIX}_SRCS
 add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
 if(WIN32)
-       target_link_libraries(${MODULE_NAME} secur32)
+       set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} secur32)
 endif()
 
-target_link_libraries(${MODULE_NAME} winpr-sspi)
+set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
+       MONOLITHIC ${MONOLITHIC_BUILD}
+       MODULE winpr
+       MODULES winpr-sspi)
+
+target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
 foreach(test ${${MODULE_PREFIX}_TESTS})
        get_filename_component(TestName ${test} NAME_WE)