Skip to content
This repository has been archived by the owner on Mar 29, 2024. It is now read-only.

Commit

Permalink
fix compilation of unit tests : revert commit #8d8354f because tulip-…
Browse files Browse the repository at this point in the history
…core specific tests do not have to depend of plugins build + add plugins tests dependency to plugins build
  • Loading branch information
p-mary committed Dec 22, 2017
1 parent 55b0c88 commit 5a4ce9f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
1 change: 0 additions & 1 deletion tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ MACRO(UNIT_TEST)
INCLUDE_DIRECTORIES(${TulipCoreBuildInclude} ${TulipCoreInclude} ${CppUnit_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/tests/include)
LINK_DIRECTORIES(${CppUnit_LIBRARY_DIRS})
ADD_EXECUTABLE(${TEST_NAME} ${TEST_SRCS})
ADD_DEPENDENCIES(${TEST_NAME} ${TULIP_PLUGIN_TARGETS})
ADD_DEPENDENCIES(runTests ${TEST_NAME})
TARGET_LINK_LIBRARIES(${TEST_NAME} ${LibTulipCoreName} ${CppUnit_LIBRARIES})
ADD_TEST(NAME ${TEST_NAME} COMMAND ${TEST_NAME} ${TEST_NAME})
Expand Down
9 changes: 7 additions & 2 deletions tests/plugins/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
MACRO(UNIT_PLUGINS_TEST)
UNIT_TEST(${ARGV0} ${ARGN})
ADD_DEPENDENCIES(${ARGV0} ${TULIP_PLUGIN_TARGETS})
ENDMACRO(UNIT_PLUGINS_TEST)

SET(TULIP_PLUGINS_TESTS_SRCS
BasicPluginsTest.cpp
BasicMetricTest.cpp
Expand All @@ -9,9 +14,9 @@ SET_SOURCE_FILES_PROPERTIES(pluginstest.cpp pluginsloadingtest.cpp

ADD_CUSTOM_TARGET(copy_data ALL ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/data ${CMAKE_CURRENT_BINARY_DIR}/data VERBATIM)

UNIT_TEST(TulipPluginsTestSuite ${TULIP_PLUGINS_TESTS_SRCS})
UNIT_PLUGINS_TEST(TulipPluginsTestSuite ${TULIP_PLUGINS_TESTS_SRCS})
SET_TESTS_PROPERTIES(TulipPluginsTestSuite PROPERTIES DEPENDS copy_data)

QTX_SET_INCLUDES_AND_DEFINITIONS()
UNIT_TEST(TulipPluginsLoadingTest pluginsloadingtest.cpp)
UNIT_PLUGINS_TEST(TulipPluginsLoadingTest pluginsloadingtest.cpp)
TARGET_LINK_LIBRARIES(TulipPluginsLoadingTest ${QT_LIBRARIES})

0 comments on commit 5a4ce9f

Please sign in to comment.