CMake: modernize BornAgain* library references

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}
     )

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.)

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

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

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}

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})
 

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)

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.)

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.)

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()

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.)

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.)

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.)

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.)