From 1e0edec8293828160b7ec53c46fe925881fca3de Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 3 Jul 2020 16:03:03 +0200
Subject: [PATCH] ditto for tests
---
Tests/Functional/Core/CoreSpecial/CMakeLists.txt | 4 ++--
Tests/Functional/Core/SelfConsistenceTest/CMakeLists.txt | 3 +--
Tests/Functional/Fit/FitObjective/CMakeLists.txt | 3 +--
Tests/Functional/Fit/Minimizer/CMakeLists.txt | 3 +--
Tests/Functional/GUI/GUISpecial/CMakeLists.txt | 3 +--
Tests/Functional/Python/PyEmbedded/CMakeLists.txt | 4 +---
Tests/Functional/TestMachinery/CMakeLists.txt | 7 +------
Tests/UnitTests/Core/CMakeLists.txt | 3 +--
Tests/UnitTests/Fit/CMakeLists.txt | 3 +--
Tests/UnitTests/GUI/CMakeLists.txt | 3 +--
Tests/UnitTests/Numeric/CMakeLists.txt | 3 +--
11 files changed, 12 insertions(+), 27 deletions(-)
diff --git a/Tests/Functional/Core/CoreSpecial/CMakeLists.txt b/Tests/Functional/Core/CoreSpecial/CMakeLists.txt
index caee8a2465f..986a6cd6861 100644
--- a/Tests/Functional/Core/CoreSpecial/CMakeLists.txt
+++ b/Tests/Functional/Core/CoreSpecial/CMakeLists.txt
@@ -12,8 +12,8 @@ set(test_cases
# build executables for each test case
file(GLOB source_files "*.cpp")
-file(GLOB include_files "*.h")
-add_executable(${test} ${include_files} ${source_files})
+
+add_executable(${test} ${source_files})
target_link_libraries(${test} BornAgainCore BornAgainTestMachinery)
# create test cases
diff --git a/Tests/Functional/Core/SelfConsistenceTest/CMakeLists.txt b/Tests/Functional/Core/SelfConsistenceTest/CMakeLists.txt
index 2dd14f3e88d..5f7ca44e1a7 100644
--- a/Tests/Functional/Core/SelfConsistenceTest/CMakeLists.txt
+++ b/Tests/Functional/Core/SelfConsistenceTest/CMakeLists.txt
@@ -14,9 +14,8 @@ set(test_cases
)
file(GLOB source_files "*.cpp")
-file(GLOB include_files "*.h")
-add_executable(${test} ${include_files} ${source_files})
+add_executable(${test} ${source_files})
target_link_libraries(${test} BornAgainCore BornAgainTestMachinery)
foreach(test_case ${test_cases})
add_test(${test}/${test_case}
diff --git a/Tests/Functional/Fit/FitObjective/CMakeLists.txt b/Tests/Functional/Fit/FitObjective/CMakeLists.txt
index 923e4e6045f..b109eea4a5f 100644
--- a/Tests/Functional/Fit/FitObjective/CMakeLists.txt
+++ b/Tests/Functional/Fit/FitObjective/CMakeLists.txt
@@ -21,9 +21,8 @@ set(test_cases
include_directories(${RootMinimizers_INCLUDE_DIRS})
file(GLOB source_files "*.cpp")
-file(GLOB include_files "*.h")
-add_executable(${test} ${include_files} ${source_files})
+add_executable(${test} ${source_files})
target_link_libraries(${test} BornAgainCore BornAgainTestMachinery)
foreach(test_case ${test_cases})
diff --git a/Tests/Functional/Fit/Minimizer/CMakeLists.txt b/Tests/Functional/Fit/Minimizer/CMakeLists.txt
index 0d5396ca659..c74291e5b18 100644
--- a/Tests/Functional/Fit/Minimizer/CMakeLists.txt
+++ b/Tests/Functional/Fit/Minimizer/CMakeLists.txt
@@ -25,9 +25,8 @@ set(test_cases
include_directories(${RootMinimizers_INCLUDE_DIRS})
file(GLOB source_files "*.cpp")
-file(GLOB include_files "*.h")
-add_executable(${test} ${include_files} ${source_files})
+add_executable(${test} ${source_files})
target_link_libraries(${test} BornAgainCore BornAgainTestMachinery)
foreach(test_case ${test_cases})
diff --git a/Tests/Functional/GUI/GUISpecial/CMakeLists.txt b/Tests/Functional/GUI/GUISpecial/CMakeLists.txt
index 64ad6691539..79be50f6592 100644
--- a/Tests/Functional/GUI/GUISpecial/CMakeLists.txt
+++ b/Tests/Functional/GUI/GUISpecial/CMakeLists.txt
@@ -25,11 +25,10 @@ set(test_cases
)
file(GLOB source_files "*.cpp")
-file(GLOB include_files "*.h")
find_package(Qt5Core REQUIRED)
-add_executable(${test} ${include_files} ${source_files})
+add_executable(${test} ${source_files})
target_link_libraries(${test} BornAgainCore BornAgainGUI BornAgainTestMachinery)
target_link_libraries(${test} Qt5::Core)
diff --git a/Tests/Functional/Python/PyEmbedded/CMakeLists.txt b/Tests/Functional/Python/PyEmbedded/CMakeLists.txt
index ceda8dbbe79..f396f183e0b 100644
--- a/Tests/Functional/Python/PyEmbedded/CMakeLists.txt
+++ b/Tests/Functional/Python/PyEmbedded/CMakeLists.txt
@@ -19,12 +19,10 @@ include_directories(
)
file(GLOB source_files "*.cpp")
-file(GLOB include_files "*.h")
-add_executable(${test} ${include_files} ${source_files})
+add_executable(${test} ${source_files})
target_link_libraries(${test} BornAgainCore BornAgainTestMachinery)
foreach(test_case ${test_cases})
add_test(${test}/${test_case} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${test} ${test_case})
endforeach()
-
diff --git a/Tests/Functional/TestMachinery/CMakeLists.txt b/Tests/Functional/TestMachinery/CMakeLists.txt
index 02744f40ed0..8b4284adaf2 100644
--- a/Tests/Functional/TestMachinery/CMakeLists.txt
+++ b/Tests/Functional/TestMachinery/CMakeLists.txt
@@ -5,18 +5,13 @@
set(library_name BornAgainTestMachinery)
file(GLOB source_files "*.cpp")
-file(GLOB include_files "*.h")
if(WIN32)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBA_CORE_BUILD_DLL")
endif()
# --- making library ---------
-add_library(
- ${library_name}
- SHARED
- ${source_files} ${include_files}
- )
+add_library(${library_name} SHARED ${source_files})
set_target_properties(${library_name} PROPERTIES PREFIX ${libprefix} SUFFIX ${libsuffix})
set(${library_name}_LIBRARY_TYPE SHARED)
diff --git a/Tests/UnitTests/Core/CMakeLists.txt b/Tests/UnitTests/Core/CMakeLists.txt
index d698befdded..120219c1dba 100644
--- a/Tests/UnitTests/Core/CMakeLists.txt
+++ b/Tests/UnitTests/Core/CMakeLists.txt
@@ -5,9 +5,8 @@ set(test UnitTestCore)
include_directories(${CMAKE_SOURCE_DIR}/Tests/UnitTests/utilities)
file(GLOB source_files "*/*.cpp" "../utilities/TestAll.cpp")
-file(GLOB include_files "*/*.h")
-add_executable(${test} ${source_files} ${include_files})
+add_executable(${test} ${source_files})
target_link_libraries(${test} ${BornAgainCore_LIBRARY} gtest)
gtest_discover_tests(${test} TEST_PREFIX Core:Unit:)
diff --git a/Tests/UnitTests/Fit/CMakeLists.txt b/Tests/UnitTests/Fit/CMakeLists.txt
index c73c57d5d07..58defbd1cf9 100644
--- a/Tests/UnitTests/Fit/CMakeLists.txt
+++ b/Tests/UnitTests/Fit/CMakeLists.txt
@@ -5,9 +5,8 @@ set(test UnitTestFit)
include_directories(${CMAKE_SOURCE_DIR}/Tests/UnitTests/utilities)
file(GLOB source_files "*.cpp" "../utilities/TestAll.cpp")
-file(GLOB include_files "*.h")
-add_executable(${test} ${source_files} ${include_files})
+add_executable(${test} ${source_files})
target_link_libraries(${test} ${BornAgainFit_LIBRARY} gtest)
gtest_discover_tests(${test} TEST_PREFIX Fit:Unit:)
diff --git a/Tests/UnitTests/GUI/CMakeLists.txt b/Tests/UnitTests/GUI/CMakeLists.txt
index d4d10ca4765..59bd0c6e85d 100644
--- a/Tests/UnitTests/GUI/CMakeLists.txt
+++ b/Tests/UnitTests/GUI/CMakeLists.txt
@@ -3,7 +3,6 @@ include(GoogleTest)
set(test UnitTestGUI)
file(GLOB source_files "*.cpp")
-file(GLOB include_files "*.h")
find_package(Qt5Core REQUIRED)
find_package(Qt5Test REQUIRED)
@@ -11,7 +10,7 @@ find_package(Qt5Test REQUIRED)
include_directories(${CMAKE_SOURCE_DIR}/Tests/UnitTests/utilities)
set(CMAKE_AUTOMOC ON)
-add_executable(${test} ${source_files} ${include_files})
+add_executable(${test} ${source_files})
target_link_libraries(${test} ${BornAgainGUI_LIBRARY} gtest)
target_link_libraries(${test} Qt5::Core Qt5::Test)
diff --git a/Tests/UnitTests/Numeric/CMakeLists.txt b/Tests/UnitTests/Numeric/CMakeLists.txt
index e7e7fb8103d..6d8a18ef38f 100644
--- a/Tests/UnitTests/Numeric/CMakeLists.txt
+++ b/Tests/UnitTests/Numeric/CMakeLists.txt
@@ -9,9 +9,8 @@ endif()
include_directories(${CMAKE_SOURCE_DIR}/Tests/UnitTests/utilities)
file(GLOB source_files "*.cpp" "../utilities/TestAll.cpp")
-file(GLOB include_files "*.h")
-add_executable(${test} ${source_files} ${include_files})
+add_executable(${test} ${source_files})
target_link_libraries(${test} ${BornAgainCore_LIBRARY} gtest)
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
target_compile_options(${test} PUBLIC "-Wno-deprecated-copy")
--
GitLab