From 1816c2a1aac3a5655faac2a6bbde50ff0f015dc5 Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 28 Aug 2023 14:52:01 +0200 Subject: [PATCH] Tests: move Sketcher test target to appropriate CMakeLists.txt file --- tests/CMakeLists.txt | 14 +------------- tests/src/Mod/CMakeLists.txt | 1 + tests/src/Mod/Sketcher/CMakeLists.txt | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index c10aeabb6e..9dd3de88f0 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -69,6 +69,7 @@ add_executable(Tests_run) add_executable(Mesh_tests_run) add_executable(Part_tests_run) add_executable(Points_tests_run) +add_executable(Sketcher_tests_run) add_subdirectory(lib) add_subdirectory(src) target_include_directories(Tests_run PUBLIC @@ -82,16 +83,3 @@ target_link_libraries(Tests_run FreeCADApp ) -add_executable(Sketcher_tests_run) -add_subdirectory(src/Mod/Sketcher) -target_include_directories(Sketcher_tests_run PUBLIC - ${EIGEN3_INCLUDE_DIR} - ${OCC_INCLUDE_DIR} - ${Python3_INCLUDE_DIRS} - ${XercesC_INCLUDE_DIRS} -) -target_link_libraries(Sketcher_tests_run - gtest_main - ${Google_Tests_LIBS} - Sketcher -) diff --git a/tests/src/Mod/CMakeLists.txt b/tests/src/Mod/CMakeLists.txt index 3832eeb0fe..3b172b15a3 100644 --- a/tests/src/Mod/CMakeLists.txt +++ b/tests/src/Mod/CMakeLists.txt @@ -1,3 +1,4 @@ add_subdirectory(Mesh) add_subdirectory(Part) add_subdirectory(Points) +add_subdirectory(Sketcher) diff --git a/tests/src/Mod/Sketcher/CMakeLists.txt b/tests/src/Mod/Sketcher/CMakeLists.txt index 14c361067f..2931eb9c99 100644 --- a/tests/src/Mod/Sketcher/CMakeLists.txt +++ b/tests/src/Mod/Sketcher/CMakeLists.txt @@ -1 +1,15 @@ + +target_include_directories(Sketcher_tests_run PUBLIC + ${EIGEN3_INCLUDE_DIR} + ${OCC_INCLUDE_DIR} + ${Python3_INCLUDE_DIRS} + ${XercesC_INCLUDE_DIRS} +) + +target_link_libraries(Sketcher_tests_run + gtest_main + ${Google_Tests_LIBS} + Sketcher +) + add_subdirectory(App)