Simplify link libraries

kimwalisch · Jun 22, 2024 · dd4dd5e · dd4dd5e
1 parent 67f5672
commit dd4dd5e
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -172,7 +172,7 @@ endif()
 # Enable __float128 support (requires libquadmath) ###################
 
 if(WITH_FLOAT128)
-    set(LIB_QUADMATH "quadmath")
+    list(APPEND PRIMECOUNT_LINK_LIBRARIES "quadmath")
     list(APPEND PRIMECOUNT_COMPILE_DEFINITIONS "HAVE_FLOAT128")
 endif()
 
@@ -253,7 +253,7 @@ if(BUILD_SHARED_LIBS)
     set_target_properties(libprimecount PROPERTIES VERSION ${PRIMECOUNT_VERSION})
     target_compile_options(libprimecount PRIVATE "${WNO_UNINITIALIZED}")
     target_compile_definitions(libprimecount PRIVATE ${PRIMECOUNT_COMPILE_DEFINITIONS})
-    target_link_libraries(libprimecount PRIVATE primesieve::primesieve "${LIB_OPENMP}" "${LIB_QUADMATH}" "${LIB_ATOMIC}")
+    target_link_libraries(libprimecount PRIVATE primesieve::primesieve ${PRIMECOUNT_LINK_LIBRARIES})
 
     target_compile_features(libprimecount
     PRIVATE
@@ -278,7 +278,7 @@ if(BUILD_STATIC_LIBS)
     set_target_properties(libprimecount-static PROPERTIES OUTPUT_NAME primecount)
     target_compile_options(libprimecount-static PRIVATE "${WNO_UNINITIALIZED}")
     target_compile_definitions(libprimecount-static PRIVATE ${PRIMECOUNT_COMPILE_DEFINITIONS})
-    target_link_libraries(libprimecount-static PRIVATE primesieve::primesieve "${LIB_OPENMP}" "${LIB_QUADMATH}" "${LIB_ATOMIC}")
+    target_link_libraries(libprimecount-static PRIVATE primesieve::primesieve ${PRIMECOUNT_LINK_LIBRARIES})
 
     if(WITH_MSVC_CRT_STATIC)
         set_target_properties(libprimecount-static PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded")

diff --git a/cmake/OpenMP.cmake b/cmake/OpenMP.cmake
@@ -90,10 +90,12 @@ if(OpenMP_FOUND OR OpenMP_CXX_FOUND)
                 return 0;
             }" OpenMP_with_libatomic)
 
-        if(NOT OpenMP_with_libatomic)
+        if(OpenMP_with_libatomic)
+            list(APPEND PRIMECOUNT_LINK_LIBRARIES "${LIB_ATOMIC}")
+        else()
             set(LIB_ATOMIC "")
 
-            if (NOT DISABLE_INT128)
+            if(NOT DISABLE_INT128)
                 # As a last resort check if OpenMP supports int128_t if
                 # we include our <int128_OpenMP_patch.hpp> header.
                 # In this case OpenMP will use critical sections instead
@@ -129,7 +131,7 @@ if(OpenMP_FOUND OR OpenMP_CXX_FOUND)
     # OpenMP has been tested successfully, enable it
     if(OpenMP OR OpenMP_with_libatomic OR OpenMP_int128_patch)
         if(TARGET OpenMP::OpenMP_CXX)
-            set(LIB_OPENMP "OpenMP::OpenMP_CXX")
+            list(APPEND PRIMECOUNT_LINK_LIBRARIES "OpenMP::OpenMP_CXX")
         else()
             set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
         endif()

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -4,7 +4,7 @@ foreach(file ${files})
     get_filename_component(binary_name ${file} NAME_WE)
     add_executable(${binary_name} ${file})
     target_compile_definitions(${binary_name} PRIVATE ${PRIMECOUNT_COMPILE_DEFINITIONS})
-    target_link_libraries(${binary_name} primecount::primecount primesieve::primesieve "${LIB_OPENMP}" "${LIB_ATOMIC}")
+    target_link_libraries(${binary_name} primecount::primecount primesieve::primesieve ${PRIMECOUNT_LINK_LIBRARIES})
     add_test(NAME ${binary_name} COMMAND ${binary_name})
 endforeach()
 

diff --git a/test/api/CMakeLists.txt b/test/api/CMakeLists.txt
@@ -5,6 +5,6 @@ foreach(file ${files})
     get_filename_component(binary_name ${file} NAME_WE)
     add_executable(${binary_name} ${file})
     target_compile_definitions(${binary_name} PRIVATE ${PRIMECOUNT_COMPILE_DEFINITIONS})
-    target_link_libraries(${binary_name} primecount::primecount primesieve::primesieve "${LIB_OPENMP}" "${LIB_ATOMIC}")
+    target_link_libraries(${binary_name} primecount::primecount primesieve::primesieve ${PRIMECOUNT_LINK_LIBRARIES})
     add_test(NAME ${binary_name} COMMAND ${binary_name})
 endforeach()
diff --git a/test/deleglise-rivat/CMakeLists.txt b/test/deleglise-rivat/CMakeLists.txt
@@ -4,6 +4,6 @@ foreach(file ${files})
     get_filename_component(binary_name ${file} NAME_WE)
     add_executable(${binary_name} ${file})
     target_compile_definitions(${binary_name} PRIVATE ${PRIMECOUNT_COMPILE_DEFINITIONS})
-    target_link_libraries(${binary_name} primecount::primecount primesieve::primesieve "${LIB_OPENMP}" "${LIB_ATOMIC}")
+    target_link_libraries(${binary_name} primecount::primecount primesieve::primesieve ${PRIMECOUNT_LINK_LIBRARIES})
     add_test(NAME ${binary_name} COMMAND ${binary_name})
 endforeach()
diff --git a/test/gourdon/CMakeLists.txt b/test/gourdon/CMakeLists.txt
@@ -4,6 +4,6 @@ foreach(file ${files})
     get_filename_component(binary_name ${file} NAME_WE)
     add_executable(${binary_name} ${file})
     target_compile_definitions(${binary_name} PRIVATE ${PRIMECOUNT_COMPILE_DEFINITIONS})
-    target_link_libraries(${binary_name} primecount::primecount primesieve::primesieve "${LIB_OPENMP}" "${LIB_ATOMIC}")
+    target_link_libraries(${binary_name} primecount::primecount primesieve::primesieve ${PRIMECOUNT_LINK_LIBRARIES})
     add_test(NAME ${binary_name} COMMAND ${binary_name})
 endforeach()
diff --git a/test/lmo/CMakeLists.txt b/test/lmo/CMakeLists.txt
@@ -4,6 +4,6 @@ foreach(file ${files})
     get_filename_component(binary_name ${file} NAME_WE)
     add_executable(${binary_name} ${file})
     target_compile_definitions(${binary_name} PRIVATE ${PRIMECOUNT_COMPILE_DEFINITIONS})
-    target_link_libraries(${binary_name} primecount::primecount primesieve::primesieve "${LIB_OPENMP}" "${LIB_ATOMIC}")
+    target_link_libraries(${binary_name} primecount::primecount primesieve::primesieve ${PRIMECOUNT_LINK_LIBRARIES})
     add_test(NAME ${binary_name} COMMAND ${binary_name})
 endforeach()