Skip to content
Snippets Groups Projects
Commit 1e0edec8 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

ditto for tests

parent 8a4bd568
No related branches found
No related tags found
No related merge requests found
...@@ -12,8 +12,8 @@ set(test_cases ...@@ -12,8 +12,8 @@ set(test_cases
# build executables for each test case # build executables for each test case
file(GLOB source_files "*.cpp") 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) target_link_libraries(${test} BornAgainCore BornAgainTestMachinery)
# create test cases # create test cases
......
...@@ -14,9 +14,8 @@ set(test_cases ...@@ -14,9 +14,8 @@ set(test_cases
) )
file(GLOB source_files "*.cpp") 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) target_link_libraries(${test} BornAgainCore BornAgainTestMachinery)
foreach(test_case ${test_cases}) foreach(test_case ${test_cases})
add_test(${test}/${test_case} add_test(${test}/${test_case}
......
...@@ -21,9 +21,8 @@ set(test_cases ...@@ -21,9 +21,8 @@ set(test_cases
include_directories(${RootMinimizers_INCLUDE_DIRS}) include_directories(${RootMinimizers_INCLUDE_DIRS})
file(GLOB source_files "*.cpp") 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) target_link_libraries(${test} BornAgainCore BornAgainTestMachinery)
foreach(test_case ${test_cases}) foreach(test_case ${test_cases})
......
...@@ -25,9 +25,8 @@ set(test_cases ...@@ -25,9 +25,8 @@ set(test_cases
include_directories(${RootMinimizers_INCLUDE_DIRS}) include_directories(${RootMinimizers_INCLUDE_DIRS})
file(GLOB source_files "*.cpp") 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) target_link_libraries(${test} BornAgainCore BornAgainTestMachinery)
foreach(test_case ${test_cases}) foreach(test_case ${test_cases})
......
...@@ -25,11 +25,10 @@ set(test_cases ...@@ -25,11 +25,10 @@ set(test_cases
) )
file(GLOB source_files "*.cpp") file(GLOB source_files "*.cpp")
file(GLOB include_files "*.h")
find_package(Qt5Core REQUIRED) 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} BornAgainCore BornAgainGUI BornAgainTestMachinery)
target_link_libraries(${test} Qt5::Core) target_link_libraries(${test} Qt5::Core)
......
...@@ -19,12 +19,10 @@ include_directories( ...@@ -19,12 +19,10 @@ include_directories(
) )
file(GLOB source_files "*.cpp") 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) target_link_libraries(${test} BornAgainCore BornAgainTestMachinery)
foreach(test_case ${test_cases}) foreach(test_case ${test_cases})
add_test(${test}/${test_case} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${test} ${test_case}) add_test(${test}/${test_case} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${test} ${test_case})
endforeach() endforeach()
...@@ -5,18 +5,13 @@ ...@@ -5,18 +5,13 @@
set(library_name BornAgainTestMachinery) set(library_name BornAgainTestMachinery)
file(GLOB source_files "*.cpp") file(GLOB source_files "*.cpp")
file(GLOB include_files "*.h")
if(WIN32) if(WIN32)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBA_CORE_BUILD_DLL") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBA_CORE_BUILD_DLL")
endif() endif()
# --- making library --------- # --- making library ---------
add_library( add_library(${library_name} SHARED ${source_files})
${library_name}
SHARED
${source_files} ${include_files}
)
set_target_properties(${library_name} PROPERTIES PREFIX ${libprefix} SUFFIX ${libsuffix}) set_target_properties(${library_name} PROPERTIES PREFIX ${libprefix} SUFFIX ${libsuffix})
set(${library_name}_LIBRARY_TYPE SHARED) set(${library_name}_LIBRARY_TYPE SHARED)
......
...@@ -5,9 +5,8 @@ set(test UnitTestCore) ...@@ -5,9 +5,8 @@ set(test UnitTestCore)
include_directories(${CMAKE_SOURCE_DIR}/Tests/UnitTests/utilities) include_directories(${CMAKE_SOURCE_DIR}/Tests/UnitTests/utilities)
file(GLOB source_files "*/*.cpp" "../utilities/TestAll.cpp") 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) target_link_libraries(${test} ${BornAgainCore_LIBRARY} gtest)
gtest_discover_tests(${test} TEST_PREFIX Core:Unit:) gtest_discover_tests(${test} TEST_PREFIX Core:Unit:)
...@@ -5,9 +5,8 @@ set(test UnitTestFit) ...@@ -5,9 +5,8 @@ set(test UnitTestFit)
include_directories(${CMAKE_SOURCE_DIR}/Tests/UnitTests/utilities) include_directories(${CMAKE_SOURCE_DIR}/Tests/UnitTests/utilities)
file(GLOB source_files "*.cpp" "../utilities/TestAll.cpp") 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) target_link_libraries(${test} ${BornAgainFit_LIBRARY} gtest)
gtest_discover_tests(${test} TEST_PREFIX Fit:Unit:) gtest_discover_tests(${test} TEST_PREFIX Fit:Unit:)
...@@ -3,7 +3,6 @@ include(GoogleTest) ...@@ -3,7 +3,6 @@ include(GoogleTest)
set(test UnitTestGUI) set(test UnitTestGUI)
file(GLOB source_files "*.cpp") file(GLOB source_files "*.cpp")
file(GLOB include_files "*.h")
find_package(Qt5Core REQUIRED) find_package(Qt5Core REQUIRED)
find_package(Qt5Test REQUIRED) find_package(Qt5Test REQUIRED)
...@@ -11,7 +10,7 @@ find_package(Qt5Test REQUIRED) ...@@ -11,7 +10,7 @@ find_package(Qt5Test REQUIRED)
include_directories(${CMAKE_SOURCE_DIR}/Tests/UnitTests/utilities) include_directories(${CMAKE_SOURCE_DIR}/Tests/UnitTests/utilities)
set(CMAKE_AUTOMOC ON) 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} ${BornAgainGUI_LIBRARY} gtest)
target_link_libraries(${test} Qt5::Core Qt5::Test) target_link_libraries(${test} Qt5::Core Qt5::Test)
......
...@@ -9,9 +9,8 @@ endif() ...@@ -9,9 +9,8 @@ endif()
include_directories(${CMAKE_SOURCE_DIR}/Tests/UnitTests/utilities) include_directories(${CMAKE_SOURCE_DIR}/Tests/UnitTests/utilities)
file(GLOB source_files "*.cpp" "../utilities/TestAll.cpp") 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) target_link_libraries(${test} ${BornAgainCore_LIBRARY} gtest)
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
target_compile_options(${test} PUBLIC "-Wno-deprecated-copy") target_compile_options(${test} PUBLIC "-Wno-deprecated-copy")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment