diff options
| author | Martin Owens <doctormo@gmail.com> | 2017-06-23 15:38:19 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2017-06-23 15:38:19 +0000 |
| commit | 131b4d74439118c7533b0adb7353aa7e29ba93ae (patch) | |
| tree | d502c01751d683ffa73aaec48f6d5e7ea48ca75d /testfiles | |
| parent | Attempt to make paintbucket build option not cause errors for toolbar loading (diff) | |
| parent | Attempt to make paintbucket build option not cause errors for toolbar loading (diff) | |
| download | inkscape-131b4d74439118c7533b0adb7353aa7e29ba93ae.tar.gz inkscape-131b4d74439118c7533b0adb7353aa7e29ba93ae.zip | |
Merge branch 'ui-files-for-ui-xml' of gitlab.com:inkscape/inkscape into ui-files-for-ui-xml
Diffstat (limited to 'testfiles')
| -rw-r--r-- | testfiles/CMakeLists.txt | 33 |
1 files changed, 8 insertions, 25 deletions
diff --git a/testfiles/CMakeLists.txt b/testfiles/CMakeLists.txt index 3de607894..af200bea8 100644 --- a/testfiles/CMakeLists.txt +++ b/testfiles/CMakeLists.txt @@ -1,17 +1,13 @@ # ----------------------------------------------------------------------------- # # ----------------------------------------------------------------------------- -add_subdirectory(${GMOCK_DIR} ${CMAKE_BINARY_DIR}/gmock) +if(NOT GTEST_FOUND) # not required for gtest 1.8.0 and later + add_subdirectory(${GMOCK_DIR} ${CMAKE_BINARY_DIR}/gmock) -include_directories(SYSTEM ${GMOCK_DIR}/gtest/include - ${GMOCK_DIR}/include - ${CMAKE_SOURCE_DIR}/gtest/gtest/include) - -set_source_files_properties( - ${CMAKE_BINARY_DIR}/src/inkscape-version.cpp - PROPERTIES GENERATED TRUE) - -include_directories(${CMAKE_BINARY_DIR}/src) + include_directories(SYSTEM ${GMOCK_DIR}/gtest/include + ${GMOCK_DIR}/include + ${CMAKE_SOURCE_DIR}/gtest/gtest/include) +endif() set(TEST_SOURCES attributes-test @@ -22,25 +18,12 @@ set(TEST_SOURCES set(TEST_LIBS gmock_main - inkscape_base - nrtype_LIB - croco_LIB - avoid_LIB - cola_LIB - vpsc_LIB - livarot_LIB - uemf_LIB - 2geom_LIB - depixelize_LIB - util_LIB - gc_LIB - ${INKSCAPE_LIBS} -) + inkscape_base) foreach(source ${TEST_SOURCES}) add_executable(${source} src/${source}.cpp unittest.cpp doc-per-case-test.cpp) target_link_libraries(${source} ${TEST_LIBS}) - add_test(NAME ${source} COMMAND ${EXECUTABLE_OUTPUT_PATH}/${source}) + add_test(NAME ${source} COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${source}) add_dependencies(${source} inkscape_version) add_dependencies(check ${source}) endforeach()
\ No newline at end of file |