Browse Source

Fixed missing include dirs for plug-in test drivers.

Sascha Zelzer 10 years ago
parent
commit
9f445c4a02

+ 7 - 2
Plugins/org.commontk.configadmin/Testing/Cpp/CMakeLists.txt

@@ -10,10 +10,15 @@ set(MY_MOC_CXX )
 
 set(test_executable ${PROJECT_NAME}CppTests)
 
+set(${test_executable}_DEPENDENCIES ${fw_lib} ${fwtestutil_lib})
+
+set(my_includes)
+ctkFunctionGetIncludeDirs(my_includes ${test_executable})
+include_directories(${my_includes})
+
 add_executable(${test_executable} ${SRCS} ${MY_MOC_CXX})
 target_link_libraries(${test_executable}
-  ${fw_lib}
-  ${fwtestutil_lib}
+  ${${test_executable}_DEPENDENCIES}
 )
 
 add_dependencies(${test_executable} ${PROJECT_NAME} ${configadmin_test})

+ 14 - 4
Plugins/org.commontk.eventadmin/Testing/Cpp/CMakeLists.txt

@@ -12,10 +12,15 @@ set(MY_MOC_CXX )
 
 set(test_executable ${PROJECT_NAME}CppTests)
 
+set(${test_executable}_DEPENDENCIES ${fw_lib} ${fwtestutil_lib})
+
+set(my_includes)
+ctkFunctionGetIncludeDirs(my_includes ${test_executable})
+include_directories(${my_includes})
+
 add_executable(${test_executable} ctkEventAdminImplTestMain.cpp)
 target_link_libraries(${test_executable}
-  ${fw_lib}
-  ${fwtestutil_lib}
+  ${${test_executable}_DEPENDENCIES}
 )
 
 add_dependencies(${test_executable} ${PROJECT_NAME} ${eventadmin_test})
@@ -27,10 +32,15 @@ set_property(TEST ${PROJECT_NAME}Tests PROPERTY LABELS ${PROJECT_NAME})
 
 set(test_executable ${PROJECT_NAME}PerfTests)
 
+set(${test_executable}_DEPENDENCIES ${fw_lib} ${fwtestutil_lib})
+
+#set(my_includes)
+#ctkFunctionGetIncludeDirs(my_includes ${test_executable})
+#include_directories(${my_includes})
+
 add_executable(${test_executable} ctkEventAdminImplPerfTestMain.cpp)
 target_link_libraries(${test_executable}
-  ${fw_lib}
-  ${fwtestutil_lib}
+  ${${test_executable}_DEPENDENCIES}
 )
 
 add_dependencies(${test_executable} ${PROJECT_NAME} ${eventadmin_perftest})

+ 7 - 2
Plugins/org.commontk.metatype/Testing/Cpp/CMakeLists.txt

@@ -10,10 +10,15 @@ set(MY_MOC_CXX )
 
 set(test_executable ${PROJECT_NAME}CppTests)
 
+set(${test_executable}_DEPENDENCIES ${fw_lib} ${fwtestutil_lib})
+
+set(my_includes)
+ctkFunctionGetIncludeDirs(my_includes ${test_executable})
+include_directories(${my_includes})
+
 add_executable(${test_executable} ${SRCS} ${MY_MOC_CXX})
 target_link_libraries(${test_executable}
-  ${fw_lib}
-  ${fwtestutil_lib}
+  ${${test_executable}_DEPENDENCIES}
 )
 
 add_dependencies(${test_executable} ${PROJECT_NAME} ${metatype_test})