CMake: use modern whole archive linking commands

Author: TheMostDiligent

BuildTools/Android/tests/build.gradle

@@ -35,7 +35,7 @@ android {
 
     externalNativeBuild {
         cmake {
-            version '3.22.1'
+            version '3.30.3'
             path 'src/main/jni/CMakeLists.txt'
         }
     }

CMakeLists.txt

@@ -445,22 +445,6 @@ else()
 endif(MSVC)
 
 
-if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR
-    CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-    if(PLATFORM_APPLE)
-        # Looks like force_load is preferable over all_load
-        set(WHOLE_ARCHIVE_FLAG "-Wl,-force_load" CACHE INTERNAL "all_load flag")
-        # Option -noall_load is obsolete and there is no -noforce_load
-        set(NO_WHOLE_ARCHIVE_FLAG "" CACHE INTERNAL "noall_load flag")
-    else()
-        set(WHOLE_ARCHIVE_FLAG "-Wl,--whole-archive" CACHE INTERNAL "whole-archive flag")
-        set(NO_WHOLE_ARCHIVE_FLAG "-Wl,--no-whole-archive" CACHE INTERNAL "no-whole-archive flag")
-    endif()
-else()
-    set(WHOLE_ARCHIVE_FLAG "")
-    set(NO_WHOLE_ARCHIVE_FLAG "")
-endif()
-
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     # Treat warnings as errors
     set(DILIGENT_CLANG_COMPILE_OPTIONS "" CACHE STRING "Common Clang compile options")

Graphics/Archiver/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.10)
+cmake_minimum_required (VERSION 3.24)
 
 project(Diligent-Archiver CXX)
 
@@ -181,7 +181,7 @@ PUBLIC
     Diligent-ArchiverInterface
 PRIVATE
     Diligent-BuildSettings
-    ${WHOLE_ARCHIVE_FLAG} Diligent-Archiver-static ${NO_WHOLE_ARCHIVE_FLAG}
+    "$<LINK_LIBRARY:WHOLE_ARCHIVE,Diligent-Archiver-static>"
 )
 
 if(PLATFORM_WIN32)

Graphics/GraphicsEngineOpenGL/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.10)
+cmake_minimum_required (VERSION 3.24)
 
 project(Diligent-GraphicsEngineOpenGL CXX)
 
@@ -262,7 +262,7 @@ PUBLIC
 target_link_libraries(Diligent-GraphicsEngineOpenGL-shared
 PRIVATE
     Diligent-BuildSettings
-    ${WHOLE_ARCHIVE_FLAG} Diligent-GraphicsEngineOpenGL-static ${NO_WHOLE_ARCHIVE_FLAG}
+    "$<LINK_LIBRARY:WHOLE_ARCHIVE,Diligent-GraphicsEngineOpenGL-static>"
 PUBLIC
     ${PUBLIC_DEPENDENCIES}
 )

Graphics/GraphicsEngineVulkan/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.10)
+cmake_minimum_required (VERSION 3.24)
 
 include(../../BuildTools/CMake/VulkanUtils.cmake)
 
@@ -286,7 +286,7 @@ PUBLIC
 target_link_libraries(Diligent-GraphicsEngineVk-shared
 PRIVATE
     Diligent-BuildSettings
-    ${WHOLE_ARCHIVE_FLAG} Diligent-GraphicsEngineVk-static ${NO_WHOLE_ARCHIVE_FLAG}
+    "$<LINK_LIBRARY:WHOLE_ARCHIVE,Diligent-GraphicsEngineVk-static>"
 PUBLIC
     ${PUBLIC_DEPENDENCIES}
 )

Tests/GPUTestFramework/CMakeLists.txt

@@ -1,5 +1,7 @@
 cmake_minimum_required (VERSION 3.17)
 
+include(../../BuildTools/CMake/BuildUtils.cmake)
+
 project(Diligent-GPUTestFramework)
 
 set(SOURCE src/GPUTestingEnvironment.cpp src/TestingSwapChainBase.cpp)
@@ -156,5 +158,6 @@ set_target_properties(Diligent-GPUTestFramework PROPERTIES
 )
 
 if (TARGET Diligent-Archiver-shared)
-    target_link_libraries(Diligent-GPUTestFramework PUBLIC Diligent-Archiver-shared)
+    get_backend_libraries_type(LIB_TYPE)
+    target_link_libraries(Diligent-GPUTestFramework PUBLIC Diligent-Archiver-${LIB_TYPE})
 endif()