Cleanup tests-common dependency

Change-Id: I03b0aaa1b184524dc3fc702e5391ca055bf78420

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index c39e7c3b97ac066f31c29ee306cfd4db4ced9062..62e0cd38d3c2f3f8dd11bbb919b33b71cd4a3e1c 100644 (file)
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -1,5 +1,4 @@
 INCLUDE(FindPkgConfig)
-SET(COMMON_TARGET_TEST "tests-common")
 
 #dependencies
 PKG_CHECK_MODULES(COMMON_TARGET_DEP

diff --git a/src/cynara-tests/CMakeLists.txt b/src/cynara-tests/CMakeLists.txt
index bf592b40806149a71c64e413dc9a7e4933543a6c..e39ab3bd4466b57aa4ce154d7f3106d9e63c27a6 100644 (file)
--- a/src/cynara-tests/CMakeLists.txt
+++ b/src/cynara-tests/CMakeLists.txt
@@ -80,7 +80,7 @@ ADD_EXECUTABLE(${CYNARA_TARGET_TEST} ${CYNARA_TARGET_TEST_SOURCES})
 #linker directories
 TARGET_LINK_LIBRARIES(${CYNARA_TARGET_TEST}
     ${CYNARA_TARGET_DEP_LIBRARIES}
-    tests-common
+    ${COMMON_TARGET_TEST}
     dpl-test-framework
     gobject-2.0
     gio-2.0

diff --git a/src/libwebappenc-tests/CMakeLists.txt b/src/libwebappenc-tests/CMakeLists.txt
index 3f4b5aea9e9a715d085f6d5a4eecde0a62897303..83ba0832500b0c96c7c9e9f98967321776b9ac77 100644 (file)
--- a/src/libwebappenc-tests/CMakeLists.txt
+++ b/src/libwebappenc-tests/CMakeLists.txt
@@ -48,7 +48,7 @@ ADD_EXECUTABLE(${TARGET_WAE_TEST} ${TARGET_WAE_TEST_SOURCES})
 TARGET_LINK_LIBRARIES(${TARGET_WAE_TEST}
     ${TARGET_WAE_DEP_LIBRARIES}
     dpl-test-framework
-    tests-common
+    ${COMMON_TARGET_TEST}
     )
 
 #place for output file

diff --git a/src/nether-tests/CMakeLists.txt b/src/nether-tests/CMakeLists.txt
index d694bdc1d9e62f709105bf05fad4f5601a999363..d9d51c1303faacb1bb24b5ace43dfc9db9e637bf 100644 (file)
--- a/src/nether-tests/CMakeLists.txt
+++ b/src/nether-tests/CMakeLists.txt
@@ -23,14 +23,6 @@ SET(TARGET_NETHER_TESTS "nether-tests")
 
 SET(NETHER_TESTS_SOURCES
     ${PROJECT_SOURCE_DIR}/src/nether-tests/nether_tests.cpp
-    ${PROJECT_SOURCE_DIR}/src/common/tests_common.cpp
-    ${PROJECT_SOURCE_DIR}/src/common/tzplatform.cpp
-    ${PROJECT_SOURCE_DIR}/src/common/sm_api.cpp
-    ${PROJECT_SOURCE_DIR}/src/common/sm_request.cpp
-    ${PROJECT_SOURCE_DIR}/src/common/sm_user_request.cpp
-    ${PROJECT_SOURCE_DIR}/src/common/sm_policy_request.cpp
-    ${PROJECT_SOURCE_DIR}/src/common/app_install_helper.cpp
-    ${PROJECT_SOURCE_DIR}/src/common/dac.cpp
     ${PROJECT_SOURCE_DIR}/src/security-manager-tests/common/sm_commons.cpp
     ${PROJECT_SOURCE_DIR}/src/security-manager-tests/common/policy_configuration.cpp
     ${PROJECT_SOURCE_DIR}/src/security-manager-tests/common/template_parser.cpp
@@ -58,7 +50,7 @@ ADD_EXECUTABLE(${TARGET_NETHER_TESTS} ${NETHER_TESTS_SOURCES})
 TARGET_LINK_LIBRARIES(${TARGET_NETHER_TESTS}
     ${SEC_MGR_TESTS_DEP_LIBRARIES}
     dpl-test-framework
-    tests-common
+    ${COMMON_TARGET_TEST}
     ${CMAKE_THREAD_LIBS_INIT}
     )
 

diff --git a/src/ode/CMakeLists.txt b/src/ode/CMakeLists.txt
index f7fd464506483c68f5e4f11499ffb45865006ada..8b930fe7a456d602daa1c2f610527aea620816a7 100644 (file)
--- a/src/ode/CMakeLists.txt
+++ b/src/ode/CMakeLists.txt
@@ -48,7 +48,7 @@ TARGET_LINK_LIBRARIES(
     ${ODE_TESTS}
     ${ODE_TESTS_DEPS_LIBRARIES}
     dpl-test-framework
-    tests-common
+    ${COMMON_TARGET_TEST}
 )
 
 ## Install #####################################################################

diff --git a/src/security-manager-tests/CMakeLists.txt b/src/security-manager-tests/CMakeLists.txt
index 57d277f098f85540e558262922e177f965ca185f..9c9e3e228db2207de1994e6f12c099f36e4d6962 100644 (file)
--- a/src/security-manager-tests/CMakeLists.txt
+++ b/src/security-manager-tests/CMakeLists.txt
@@ -96,7 +96,7 @@ ADD_EXECUTABLE(${TARGET_SEC_MGR_TESTS} ${SEC_MGR_SOURCES})
 TARGET_LINK_LIBRARIES(${TARGET_SEC_MGR_TESTS}
     ${SEC_MGR_TESTS_DEP_LIBRARIES}
     dpl-test-framework
-    tests-common
+    ${COMMON_TARGET_TEST}
     rt
     ${CMAKE_THREAD_LIBS_INIT}
     )

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 4c54c04c74d208d53aedebbab3aaba943762455c..fcb2cbf56225ed6de48145226d903d85bd852cf9 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -48,7 +48,7 @@ ADD_EXECUTABLE(${INNER_TARGET_TEST} ${INNER_TARGET_TEST_SOURCES})
 #linker directories
 TARGET_LINK_LIBRARIES(${INNER_TARGET_TEST}
     ${INNER_TARGET_DEP_LIBRARIES}
-    tests-common
+    ${COMMON_TARGET_TEST}
     dpl-test-framework
     ${CMAKE_THREAD_LIBS_INIT}
     )

diff --git a/tests/cleanup/CMakeLists.txt b/tests/cleanup/CMakeLists.txt
index 03b7b2d1f1dd67ceda334964ba9381460e977811..1aa885ff779871fd56afcb7712f623eac66ebbbf 100644 (file)
--- a/tests/cleanup/CMakeLists.txt
+++ b/tests/cleanup/CMakeLists.txt
@@ -33,7 +33,7 @@ ADD_EXECUTABLE(${CLEANUP_TARGET_TEST} ${CLEANUP_TARGET_TEST_SOURCES})
 
 #linker directories
 TARGET_LINK_LIBRARIES(${CLEANUP_TARGET_TEST}
-    tests-common
+    ${COMMON_TARGET_TEST}
     dpl-test-framework
     )