From 7db1409a2f03d4bc1cd9eb2b0b8dbe87c0565da6 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Tue, 10 May 2022 10:57:46 +0200
Subject: [PATCH] CMake: modernize BornAgain* library references
---
Device/CMakeLists.txt | 10 +++++-----
Fit/Test/Unit/CMakeLists.txt | 2 +-
Param/CMakeLists.txt | 4 ++--
Resample/CMakeLists.txt | 2 +-
Sample/CMakeLists.txt | 2 +-
Sim/CMakeLists.txt | 6 +++---
Tests/Functional/Suite/CMakeLists.txt | 2 +-
Tests/Unit/Base/CMakeLists.txt | 2 +-
Tests/Unit/Device/CMakeLists.txt | 2 +-
Tests/Unit/Numeric/CMakeLists.txt | 2 +-
Tests/Unit/Param/CMakeLists.txt | 2 +-
Tests/Unit/Resample/CMakeLists.txt | 2 +-
Tests/Unit/Sample/CMakeLists.txt | 2 +-
Tests/Unit/Sim/CMakeLists.txt | 2 +-
14 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/Device/CMakeLists.txt b/Device/CMakeLists.txt
index 4937f16383a..07952cf0864 100644
--- a/Device/CMakeLists.txt
+++ b/Device/CMakeLists.txt
@@ -20,11 +20,11 @@ set(${lib}_LIBRARY ${lib} PARENT_SCOPE)
target_link_libraries(${lib}
PUBLIC
- ${BornAgainBase_LIBRARY}
- ${BornAgainFit_LIBRARY}
- ${BornAgainParam_LIBRARY}
- ${BornAgainSample_LIBRARY}
- ${BornAgainResample_LIBRARY}
+ BornAgainBase
+ BornAgainFit
+ BornAgainParam
+ BornAgainSample
+ BornAgainResample
${CMAKE_THREAD_LIBS_INIT}
${tspectrum_LIBRARY}
)
diff --git a/Fit/Test/Unit/CMakeLists.txt b/Fit/Test/Unit/CMakeLists.txt
index 3b5441e050f..df5763cfe43 100644
--- a/Fit/Test/Unit/CMakeLists.txt
+++ b/Fit/Test/Unit/CMakeLists.txt
@@ -7,6 +7,6 @@ include_directories(${CMAKE_SOURCE_DIR}/Tests/Unit/utilities)
file(GLOB source_files "*.cpp" ${CMAKE_SOURCE_DIR}/Tests/GTestWrapper/TestAll.cpp)
add_executable(${test} ${source_files})
-target_link_libraries(${test} ${BornAgainFit_LIBRARY} gtest)
+target_link_libraries(${test} BornAgainFit gtest)
gtest_discover_tests(${test} DISCOVERY_TIMEOUT 300 TEST_PREFIX Fit.Unit.)
diff --git a/Param/CMakeLists.txt b/Param/CMakeLists.txt
index cd64cd11eca..5faa98a59cd 100644
--- a/Param/CMakeLists.txt
+++ b/Param/CMakeLists.txt
@@ -20,8 +20,8 @@ set(${lib}_LIBRARY ${lib} PARENT_SCOPE)
target_link_libraries(${lib}
PUBLIC
- ${BornAgainBase_LIBRARY}
- ${BornAgainFit_LIBRARY}
+ BornAgainBase
+ BornAgainFit
)
target_include_directories(${lib}
PUBLIC
diff --git a/Resample/CMakeLists.txt b/Resample/CMakeLists.txt
index 03ab0d5e14a..b93d3c75fdf 100644
--- a/Resample/CMakeLists.txt
+++ b/Resample/CMakeLists.txt
@@ -20,7 +20,7 @@ set(${lib}_LIBRARY ${lib} PARENT_SCOPE)
target_link_libraries(${lib}
PUBLIC
- ${BornAgainSample_LIBRARY}
+ BornAgainSample
)
target_include_directories(${lib}
PUBLIC
diff --git a/Sample/CMakeLists.txt b/Sample/CMakeLists.txt
index 5ffed8120d9..a9c71c09920 100644
--- a/Sample/CMakeLists.txt
+++ b/Sample/CMakeLists.txt
@@ -20,7 +20,7 @@ set(${lib}_LIBRARY ${lib} PARENT_SCOPE)
target_link_libraries(${lib}
PUBLIC
- ${BornAgainParam_LIBRARY}
+ BornAgainParam
formfactor
)
target_include_directories(${lib}
diff --git a/Sim/CMakeLists.txt b/Sim/CMakeLists.txt
index 18c168ecb1e..e684d8bb5fd 100644
--- a/Sim/CMakeLists.txt
+++ b/Sim/CMakeLists.txt
@@ -20,10 +20,10 @@ set(${lib}_LIBRARY ${lib} PARENT_SCOPE)
target_link_libraries(${lib}
PUBLIC
- ${BornAgainSample_LIBRARY}
- ${BornAgainDevice_LIBRARY}
+ BornAgainSample
+ BornAgainDevice
PRIVATE
- ${BornAgainResample_LIBRARY}
+ BornAgainResample
${CMAKE_THREAD_LIBS_INIT}
${cerf_target})
diff --git a/Tests/Functional/Suite/CMakeLists.txt b/Tests/Functional/Suite/CMakeLists.txt
index d12fe01028d..11617a4f789 100644
--- a/Tests/Functional/Suite/CMakeLists.txt
+++ b/Tests/Functional/Suite/CMakeLists.txt
@@ -8,4 +8,4 @@ add_library(${lib} SHARED MakeSimulations.cpp)
target_include_directories(${lib} PUBLIC ${CMAKE_SOURCE_DIR})
-target_link_libraries(${lib} PUBLIC ${BornAgainSim_LIBRARY})
+target_link_libraries(${lib} PUBLIC BornAgainSim)
diff --git a/Tests/Unit/Base/CMakeLists.txt b/Tests/Unit/Base/CMakeLists.txt
index 40848d3509c..e26fbe0f449 100644
--- a/Tests/Unit/Base/CMakeLists.txt
+++ b/Tests/Unit/Base/CMakeLists.txt
@@ -5,6 +5,6 @@ set(test UnitTestBase)
file(GLOB source_files "*.cpp" ${CMAKE_SOURCE_DIR}/Tests/GTestWrapper/TestAll.cpp)
add_executable(${test} ${source_files})
-target_link_libraries(${test} ${BornAgainBase_LIBRARY} gtest)
+target_link_libraries(${test} BornAgainBase gtest)
gtest_discover_tests(${test} DISCOVERY_TIMEOUT 300 TEST_PREFIX Base.Unit.)
diff --git a/Tests/Unit/Device/CMakeLists.txt b/Tests/Unit/Device/CMakeLists.txt
index 940658efdae..be2a12962c4 100644
--- a/Tests/Unit/Device/CMakeLists.txt
+++ b/Tests/Unit/Device/CMakeLists.txt
@@ -5,6 +5,6 @@ set(test UnitTestDevice)
file(GLOB source_files "*.cpp" ${CMAKE_SOURCE_DIR}/Tests/GTestWrapper/TestAll.cpp)
add_executable(${test} ${source_files})
-target_link_libraries(${test} ${BornAgainDevice_LIBRARY} gtest)
+target_link_libraries(${test} BornAgainDevice gtest)
gtest_discover_tests(${test} DISCOVERY_TIMEOUT 300 TEST_PREFIX Device.Unit.)
diff --git a/Tests/Unit/Numeric/CMakeLists.txt b/Tests/Unit/Numeric/CMakeLists.txt
index f9d3a20263e..c84a1136d29 100644
--- a/Tests/Unit/Numeric/CMakeLists.txt
+++ b/Tests/Unit/Numeric/CMakeLists.txt
@@ -12,7 +12,7 @@ add_executable(${test} ${source_files})
target_include_directories(${test} PUBLIC
${CMAKE_SOURCE_DIR}/3rdparty/common/gtest/gtest-1.8.0/include
${CMAKE_SOURCE_DIR}/Tests/Unit/utilities)
-target_link_libraries(${test} ${BornAgainSim_LIBRARY} gtest)
+target_link_libraries(${test} BornAgainSim gtest)
if(GCC)
target_compile_options(${test} PUBLIC "-Wno-deprecated-copy")
endif()
diff --git a/Tests/Unit/Param/CMakeLists.txt b/Tests/Unit/Param/CMakeLists.txt
index 7f5af30211c..9364c7fc166 100644
--- a/Tests/Unit/Param/CMakeLists.txt
+++ b/Tests/Unit/Param/CMakeLists.txt
@@ -5,6 +5,6 @@ set(test UnitTestParam)
file(GLOB source_files "*.cpp" ${CMAKE_SOURCE_DIR}/Tests/GTestWrapper/TestAll.cpp)
add_executable(${test} ${source_files})
-target_link_libraries(${test} ${BornAgainParam_LIBRARY} gtest)
+target_link_libraries(${test} BornAgainParam gtest)
gtest_discover_tests(${test} DISCOVERY_TIMEOUT 300 TEST_PREFIX Param.Unit.)
diff --git a/Tests/Unit/Resample/CMakeLists.txt b/Tests/Unit/Resample/CMakeLists.txt
index 3ee2b450ef4..7df8be8a6fe 100644
--- a/Tests/Unit/Resample/CMakeLists.txt
+++ b/Tests/Unit/Resample/CMakeLists.txt
@@ -5,6 +5,6 @@ set(test UnitTestResample)
file(GLOB source_files "*.cpp" ${CMAKE_SOURCE_DIR}/Tests/GTestWrapper/TestAll.cpp)
add_executable(${test} ${source_files})
-target_link_libraries(${test} ${BornAgainResample_LIBRARY} gtest)
+target_link_libraries(${test} BornAgainResample gtest)
gtest_discover_tests(${test} DISCOVERY_TIMEOUT 300 TEST_PREFIX Resample.Unit.)
diff --git a/Tests/Unit/Sample/CMakeLists.txt b/Tests/Unit/Sample/CMakeLists.txt
index 908e9f2ffe6..073550d70d0 100644
--- a/Tests/Unit/Sample/CMakeLists.txt
+++ b/Tests/Unit/Sample/CMakeLists.txt
@@ -5,6 +5,6 @@ set(test UnitTestSample)
file(GLOB source_files "*.cpp" ${CMAKE_SOURCE_DIR}/Tests/GTestWrapper/TestAll.cpp)
add_executable(${test} ${source_files})
-target_link_libraries(${test} ${BornAgainSample_LIBRARY} gtest)
+target_link_libraries(${test} BornAgainSample gtest)
gtest_discover_tests(${test} DISCOVERY_TIMEOUT 300 TEST_PREFIX Sample.Unit.)
diff --git a/Tests/Unit/Sim/CMakeLists.txt b/Tests/Unit/Sim/CMakeLists.txt
index 0f7693463bf..b537c91cfcf 100644
--- a/Tests/Unit/Sim/CMakeLists.txt
+++ b/Tests/Unit/Sim/CMakeLists.txt
@@ -5,6 +5,6 @@ set(test UnitTestCore)
file(GLOB source_files "*.cpp" ${CMAKE_SOURCE_DIR}/Tests/GTestWrapper/TestAll.cpp)
add_executable(${test} ${source_files})
-target_link_libraries(${test} ${BornAgainSim_LIBRARY} gtest)
+target_link_libraries(${test} BornAgainSim gtest)
gtest_discover_tests(${test} DISCOVERY_TIMEOUT 300 TEST_PREFIX Sim.Unit.)
--
GitLab