Explorar o código

Merge topic 'LINK_LIBRARY-WHOLE_ARCHIVE'

dabe56de58 genex-LINK_LIBRARY: Add feature WHOLE_ARCHIVE

Acked-by: Kitware Robot <[email protected]>
Acked-by: huangqinjin <[email protected]>
Merge-request: !7064
Brad King %!s(int64=3) %!d(string=hai) anos
pai
achega
a4b04e62fc

+ 2 - 2
Help/manual/cmake-generator-expressions.7.rst

@@ -1125,9 +1125,9 @@ Output-Related Expressions
 
 
     add_library(lib1 STATIC ...)
     add_library(lib1 STATIC ...)
     add_library(lib2 ...)
     add_library(lib2 ...)
-    target_link_libraries(lib2 PRIVATE "$<LINK_LIBRARY:whole_archive,lib1>")
+    target_link_libraries(lib2 PRIVATE "$<LINK_LIBRARY:load_archive,lib1>")
 
 
-  This specify to use the ``lib1`` target with feature ``whole_archive`` for
+  This specify to use the ``lib1`` target with feature ``load_archive`` for
   linking target ``lib2``. The feature must have be defined by
   linking target ``lib2``. The feature must have be defined by
   :variable:`CMAKE_<LANG>_LINK_LIBRARY_USING_<FEATURE>` variable or, if
   :variable:`CMAKE_<LANG>_LINK_LIBRARY_USING_<FEATURE>` variable or, if
   :variable:`CMAKE_<LANG>_LINK_LIBRARY_USING_<FEATURE>_SUPPORTED` is false,
   :variable:`CMAKE_<LANG>_LINK_LIBRARY_USING_<FEATURE>_SUPPORTED` is false,

+ 14 - 0
Help/release/dev/LINK_LIBRARY-WHOLE_ARCHIVE.rst

@@ -0,0 +1,14 @@
+LINK_LIBRARY-WHOLE_ARCHIVE
+--------------------------
+
+* The :genex:`LINK_LIBRARY` generator expression gained the feature
+  ``WHOLE_ARCHIVE`` to force load of all members in a static library. This
+  feature is supported on the following target platforms:
+
+  * all ``Apple`` variants
+  * ``Linux``
+  * all ``BSD`` variants
+  * ``SunOS``
+  * ``Windows``
+  * ``CYGWIN``
+  * ``MSYS``

+ 9 - 9
Help/variable/CMAKE_LINK_LIBRARY_USING_FEATURE.txt

@@ -46,27 +46,27 @@ is offered by various environments but with a specific syntax:
 
 
 .. code-block:: cmake
 .. code-block:: cmake
 
 
-  set(CMAKE_C_LINK_LIBRARY_USING_whole_archive_SUPPORTED TRUE)
+  set(CMAKE_C_LINK_LIBRARY_USING_load_archive_SUPPORTED TRUE)
   if(CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
   if(CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
-    set(CMAKE_C_LINK_LIBRARY_USING_whole_archive "-force_load <LIB_ITEM>")
+    set(CMAKE_C_LINK_LIBRARY_USING_load_archive "-force_load <LIB_ITEM>")
   elseif(CMAKE_C_COMPILER_ID STREQUAL "GNU"
   elseif(CMAKE_C_COMPILER_ID STREQUAL "GNU"
          AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
          AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    set(CMAKE_C_LINK_LIBRARY_USING_whole_archive "LINKER:--push-state,--whole-archive"
-                                                 "<LINK_ITEM>"
-                                                 "LINKER:--pop-state")
+    set(CMAKE_C_LINK_LIBRARY_USING_load_archive "LINKER:--push-state,--whole-archive"
+                                                "<LINK_ITEM>"
+                                                "LINKER:--pop-state")
   elseif(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
   elseif(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
-    set(CMAKE_C_LINK_LIBRARY_USING_whole_archive "/WHOLEARCHIVE:<LIBRARY>")
+    set(CMAKE_C_LINK_LIBRARY_USING_load_archive "/WHOLEARCHIVE:<LIBRARY>")
   else()
   else()
     # feature not yet supported for the other environments
     # feature not yet supported for the other environments
-    set(CMAKE_C_LINK_LIBRARY_USING_whole_archive_SUPPORTED FALSE)
+    set(CMAKE_C_LINK_LIBRARY_USING_load_archive_SUPPORTED FALSE)
   endif()
   endif()
 
 
   add_library(lib1 STATIC ...)
   add_library(lib1 STATIC ...)
 
 
   add_library(lib2 SHARED ...)
   add_library(lib2 SHARED ...)
-  if(CMAKE_C_LINK_LIBRARY_USING_whole_archive_SUPPORTED)
+  if(CMAKE_C_LINK_LIBRARY_USING_load_archive_SUPPORTED)
     target_link_libraries(lib2 PRIVATE
     target_link_libraries(lib2 PRIVATE
-      "$<LINK_LIBRARY:whole_archive,lib1,$<IF:$<LINK_LANG_AND_ID:C,Clang>,libexternal.a,external>>")
+      "$<LINK_LIBRARY:load_archive,lib1,$<IF:$<LINK_LANG_AND_ID:C,Clang>,libexternal.a,external>>")
   else()
   else()
     target_link_libraries(lib2 PRIVATE lib1 external)
     target_link_libraries(lib2 PRIVATE lib1 external)
   endif()
   endif()

+ 18 - 0
Help/variable/LINK_LIBRARY_PREDEFINED_FEATURES.txt

@@ -5,6 +5,24 @@
   useful with :prop_tgt:`LINK_LIBRARY_OVERRIDE` and
   useful with :prop_tgt:`LINK_LIBRARY_OVERRIDE` and
   :prop_tgt:`LINK_LIBRARY_OVERRIDE_<LIBRARY>` target properties.
   :prop_tgt:`LINK_LIBRARY_OVERRIDE_<LIBRARY>` target properties.
 
 
+**Features available for a subset of environments**
+
+``WHOLE_ARCHIVE``
+  Force load of all members in a static library.
+
+  Target platforms supported: all ``Apple`` variants, ``Linux``, all ``BSD``
+  variants, ``SunOS``, ``Windows``, ``CYGWIN``, and ``MSYS``.
+
+  Platform-specific notes:
+
+  * On Apple platforms, the library must be specified as a CMake target name, a
+    library file name (such as ``libfoo.a``), or a library file path (such as
+    ``/path/to/libfoo.a``).  It cannot be specified as a plain library name
+    (such as ``foo``, where ``foo`` is not CMake target), due to a limitation
+    in the Apple linker.
+  * On Windows platforms, for ``MSVC`` or MSVC-like toolchains, the version
+    must be greater than ``1900``.
+
 **Features available in Apple environments**
 **Features available in Apple environments**
 
 
 It is assumed that the linker used is the one provided by `XCode` or is
 It is assumed that the linker used is the one provided by `XCode` or is

+ 28 - 0
Modules/Platform/CYGWIN-GNU.cmake

@@ -14,6 +14,34 @@ string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " -Wl,--enable-auto-import")
 set(CMAKE_GNULD_IMAGE_VERSION
 set(CMAKE_GNULD_IMAGE_VERSION
   "-Wl,--major-image-version,<TARGET_VERSION_MAJOR>,--minor-image-version,<TARGET_VERSION_MINOR>")
   "-Wl,--major-image-version,<TARGET_VERSION_MAJOR>,--minor-image-version,<TARGET_VERSION_MINOR>")
 set(CMAKE_GENERATOR_RC windres)
 set(CMAKE_GENERATOR_RC windres)
+
+
+# Features for LINK_LIBRARY generator expression
+## check linker capabilities
+if(NOT DEFINED _CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED)
+  execute_process(COMMAND "${CMAKE_LINKER}" --help
+                  OUTPUT_VARIABLE __linker_help
+                  ERROR_VARIABLE __linker_help)
+  if(__linker_help MATCHES "--push-state" AND __linker_help MATCHES "--pop-state")
+    set(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED TRUE CACHE INTERNAL "linker supports push/pop state")
+  else()
+    set(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED FALSE CACHE INTERNAL "linker supports push/pop state")
+  endif()
+  unset(__linker_help)
+endif()
+## WHOLE_ARCHIVE: Force loading all members of an archive
+if(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED)
+  set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:--push-state,--whole-archive"
+                                             "<LINK_ITEM>"
+                                             "LINKER:--pop-state")
+else()
+  set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:--whole-archive"
+                                             "<LINK_ITEM>"
+                                             "LINKER:--no-whole-archive")
+endif()
+set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE_SUPPORTED TRUE)
+
+
 macro(__cygwin_compiler_gnu lang)
 macro(__cygwin_compiler_gnu lang)
   # Binary link rules.
   # Binary link rules.
   set(CMAKE_${lang}_CREATE_SHARED_MODULE
   set(CMAKE_${lang}_CREATE_SHARED_MODULE

+ 6 - 2
Modules/Platform/Darwin.cmake

@@ -108,7 +108,7 @@ foreach(lang C CXX Fortran OBJC OBJCXX)
 set(CMAKE_${lang}_FRAMEWORK_SEARCH_FLAG -F)
 set(CMAKE_${lang}_FRAMEWORK_SEARCH_FLAG -F)
 endforeach()
 endforeach()
 
 
-# Defines link features for frameworks
+# Defines LINK_LIBRARY features for frameworks
 set(CMAKE_LINK_LIBRARY_USING_FRAMEWORK "LINKER:-framework,<LIBRARY>")
 set(CMAKE_LINK_LIBRARY_USING_FRAMEWORK "LINKER:-framework,<LIBRARY>")
 set(CMAKE_LINK_LIBRARY_USING_FRAMEWORK_SUPPORTED TRUE)
 set(CMAKE_LINK_LIBRARY_USING_FRAMEWORK_SUPPORTED TRUE)
 
 
@@ -121,7 +121,7 @@ set(CMAKE_LINK_LIBRARY_USING_REEXPORT_FRAMEWORK_SUPPORTED TRUE)
 set(CMAKE_LINK_LIBRARY_USING_WEAK_FRAMEWORK "LINKER:-weak_framework,<LIBRARY>")
 set(CMAKE_LINK_LIBRARY_USING_WEAK_FRAMEWORK "LINKER:-weak_framework,<LIBRARY>")
 set(CMAKE_LINK_LIBRARY_USING_WEAK_FRAMEWORK_SUPPORTED TRUE)
 set(CMAKE_LINK_LIBRARY_USING_WEAK_FRAMEWORK_SUPPORTED TRUE)
 
 
-# Defines link features for libraries
+# Defines LINK_LIBRARY features for libraries
 set(CMAKE_LINK_LIBRARY_USING_NEEDED_LIBRARY "PATH{LINKER:-needed_library <LIBRARY>}NAME{LINKER:-needed-l<LIB_ITEM>}")
 set(CMAKE_LINK_LIBRARY_USING_NEEDED_LIBRARY "PATH{LINKER:-needed_library <LIBRARY>}NAME{LINKER:-needed-l<LIB_ITEM>}")
 set(CMAKE_LINK_LIBRARY_USING_NEEDED_LIBRARY_SUPPORTED TRUE)
 set(CMAKE_LINK_LIBRARY_USING_NEEDED_LIBRARY_SUPPORTED TRUE)
 
 
@@ -131,6 +131,10 @@ set(CMAKE_LINK_LIBRARY_USING_REEXPORT_LIBRARY_SUPPORTED TRUE)
 set(CMAKE_LINK_LIBRARY_USING_WEAK_LIBRARY "PATH{LINKER:-weak_library <LIBRARY>}NAME{LINKER:-weak-l<LIB_ITEM>}")
 set(CMAKE_LINK_LIBRARY_USING_WEAK_LIBRARY "PATH{LINKER:-weak_library <LIBRARY>}NAME{LINKER:-weak-l<LIB_ITEM>}")
 set(CMAKE_LINK_LIBRARY_USING_WEAK_LIBRARY_SUPPORTED TRUE)
 set(CMAKE_LINK_LIBRARY_USING_WEAK_LIBRARY_SUPPORTED TRUE)
 
 
+# Defines LINK_LIBRARY feature to Force loading of all members of an archive
+set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:-force_load <LIB_ITEM>")
+set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE_SUPPORTED TRUE)
+
 # default to searching for frameworks first
 # default to searching for frameworks first
 if(NOT DEFINED CMAKE_FIND_FRAMEWORK)
 if(NOT DEFINED CMAKE_FIND_FRAMEWORK)
   set(CMAKE_FIND_FRAMEWORK FIRST)
   set(CMAKE_FIND_FRAMEWORK FIRST)

+ 27 - 0
Modules/Platform/FreeBSD.cmake

@@ -26,4 +26,31 @@ foreach(type SHARED_LIBRARY SHARED_MODULE EXE)
   set(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Wl,-Bdynamic")
   set(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Wl,-Bdynamic")
 endforeach()
 endforeach()
 
 
+
+# Features for LINK_LIBRARY generator expression
+## check linker capabilities
+if(NOT DEFINED _CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED)
+  execute_process(COMMAND "${CMAKE_LINKER}" --help
+                  OUTPUT_VARIABLE __linker_help
+                  ERROR_VARIABLE __linker_help)
+  if(__linker_help MATCHES "--push-state" AND __linker_help MATCHES "--pop-state")
+    set(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED TRUE CACHE INTERNAL "linker supports push/pop state")
+  else()
+    set(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED FALSE CACHE INTERNAL "linker supports push/pop state")
+  endif()
+  unset(__linker_help)
+endif()
+## WHOLE_ARCHIVE: Force loading all members of an archive
+if(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED)
+  set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:--push-state,--whole-archive"
+                                             "<LINK_ITEM>"
+                                             "LINKER:--pop-state")
+else()
+  set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:--whole-archive"
+                                             "<LINK_ITEM>"
+                                             "LINKER:--no-whole-archive")
+endif()
+set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE_SUPPORTED TRUE)
+
+
 include(Platform/UnixPaths)
 include(Platform/UnixPaths)

+ 25 - 0
Modules/Platform/Linux.cmake

@@ -20,6 +20,31 @@ foreach(type SHARED_LIBRARY SHARED_MODULE EXE)
 endforeach()
 endforeach()
 
 
 
 
+# Features for LINK_LIBRARY generator expression
+## check linker capabilities
+if(NOT DEFINED _CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED)
+  execute_process(COMMAND "${CMAKE_LINKER}" --help
+                  OUTPUT_VARIABLE __linker_help
+                  ERROR_VARIABLE __linker_help)
+  if(__linker_help MATCHES "--push-state" AND __linker_help MATCHES "--pop-state")
+    set(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED TRUE CACHE INTERNAL "linker supports push/pop state")
+  else()
+    set(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED FALSE CACHE INTERNAL "linker supports push/pop state")
+  endif()
+  unset(__linker_help)
+endif()
+## WHOLE_ARCHIVE: Force loading all members of an archive
+if(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED)
+  set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:--push-state,--whole-archive"
+                                             "<LINK_ITEM>"
+                                             "LINKER:--pop-state")
+else()
+  set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:--whole-archive"
+                                             "<LINK_ITEM>"
+                                             "LINKER:--no-whole-archive")
+endif()
+set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE_SUPPORTED TRUE)
+
 # Features for LINK_GROUP generator expression
 # Features for LINK_GROUP generator expression
 ## RESCAN: request the linker to rescan static libraries until there is
 ## RESCAN: request the linker to rescan static libraries until there is
 ## no pending undefined symbols
 ## no pending undefined symbols

+ 27 - 0
Modules/Platform/NetBSD.cmake

@@ -12,4 +12,31 @@ set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
 set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
 set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
 set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
 set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
 
 
+
+# Features for LINK_LIBRARY generator expression
+## check linker capabilities
+if(NOT DEFINED _CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED)
+  execute_process(COMMAND "${CMAKE_LINKER}" --help
+                  OUTPUT_VARIABLE __linker_help
+                  ERROR_VARIABLE __linker_help)
+  if(__linker_help MATCHES "--push-state" AND __linker_help MATCHES "--pop-state")
+    set(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED TRUE CACHE INTERNAL "linker supports push/pop state")
+  else()
+    set(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED FALSE CACHE INTERNAL "linker supports push/pop state")
+  endif()
+  unset(__linker_help)
+endif()
+## WHOLE_ARCHIVE: Force loading all members of an archive
+if(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED)
+  set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:--push-state,--whole-archive"
+                                             "<LINK_ITEM>"
+                                             "LINKER:--pop-state")
+else()
+  set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:--whole-archive"
+                                             "<LINK_ITEM>"
+                                             "LINKER:--no-whole-archive")
+endif()
+set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE_SUPPORTED TRUE)
+
+
 include(Platform/UnixPaths)
 include(Platform/UnixPaths)

+ 14 - 0
Modules/Platform/SunOS.cmake

@@ -8,6 +8,20 @@ if(CMAKE_SYSTEM MATCHES "SunOS-4")
 endif()
 endif()
 
 
 
 
+# Features for LINK_LIBRARY generator expression
+## WHOLE_ARCHIVE: Force loading all members of an archive
+if (CMAKE_SYSTEM_VERSION VERSION_GREATER "5.10")
+  set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:--whole-archive"
+                                             "<LINK_ITEM>"
+                                             "LINKER:--no-whole-archive")
+else()
+  set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:-z,allextract"
+                                             "<LINK_ITEM>"
+                                             "LINKER:-z,defaultextract")
+endif()
+set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE_SUPPORTED TRUE)
+
+
 # Features for LINK_GROUP generator expression
 # Features for LINK_GROUP generator expression
 if (CMAKE_SYSTEM_VERSION VERSION_GREATER "5.9")
 if (CMAKE_SYSTEM_VERSION VERSION_GREATER "5.9")
   ## RESCAN: request the linker to rescan static libraries until there is
   ## RESCAN: request the linker to rescan static libraries until there is

+ 7 - 0
Modules/Platform/Windows-Clang.cmake

@@ -113,6 +113,13 @@ macro(__windows_compiler_clang_gnu lang)
   string(TOLOWER "${CMAKE_BUILD_TYPE}" BUILD_TYPE_LOWER)
   string(TOLOWER "${CMAKE_BUILD_TYPE}" BUILD_TYPE_LOWER)
   set(CMAKE_${lang}_STANDARD_LIBRARIES_INIT "-lkernel32 -luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32 -loldnames")
   set(CMAKE_${lang}_STANDARD_LIBRARIES_INIT "-lkernel32 -luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32 -loldnames")
 
 
+  # Features for LINK_LIBRARY generator expression
+  if(MSVC_VERSION GREATER "1900")
+    ## WHOLE_ARCHIVE: Force loading all members of an archive
+    set(CMAKE_${lang}_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:/WHOLEARCHIVE:<LIBRARY>")
+    set(CMAKE_${lang}_LINK_LIBRARY_USING_WHOLE_ARCHIVE_SUPPORTED TRUE)
+  endif()
+
   enable_language(RC)
   enable_language(RC)
 endmacro()
 endmacro()
 
 

+ 25 - 0
Modules/Platform/Windows-GNU.cmake

@@ -45,6 +45,31 @@ if("${_help}" MATCHES "GNU ld .* 2\\.1[1-6]")
 endif()
 endif()
 
 
 
 
+# Features for LINK_LIBRARY generator expression
+## check linker capabilities
+if(NOT DEFINED _CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED)
+  execute_process(COMMAND "${CMAKE_LINKER}" --help
+                  OUTPUT_VARIABLE __linker_help
+                  ERROR_VARIABLE __linker_help)
+  if(__linker_help MATCHES "--push-state" AND __linker_help MATCHES "--pop-state")
+    set(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED TRUE CACHE INTERNAL "linker supports push/pop state")
+  else()
+    set(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED FALSE CACHE INTERNAL "linker supports push/pop state")
+  endif()
+  unset(__linker_help)
+endif()
+## WHOLE_ARCHIVE: Force loading all members of an archive
+if(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED)
+  set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:--push-state,--whole-archive"
+                                             "<LINK_ITEM>"
+                                             "LINKER:--pop-state")
+else()
+  set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:--whole-archive"
+                                             "<LINK_ITEM>"
+                                             "LINKER:--no-whole-archive")
+endif()
+set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE_SUPPORTED TRUE)
+
 # Features for LINK_GROUP generator expression
 # Features for LINK_GROUP generator expression
 ## RESCAN: request the linker to rescan static libraries until there is
 ## RESCAN: request the linker to rescan static libraries until there is
 ## no pending undefined symbols
 ## no pending undefined symbols

+ 9 - 0
Modules/Platform/Windows-MSVC.cmake

@@ -331,6 +331,15 @@ else()
 endif()
 endif()
 unset(__WINDOWS_MSVC_CMP0091)
 unset(__WINDOWS_MSVC_CMP0091)
 
 
+
+# Features for LINK_LIBRARY generator expression
+if(MSVC_VERSION GREATER "1900")
+  ## WHOLE_ARCHIVE: Force loading all members of an archive
+  set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "/WHOLEARCHIVE:<LIBRARY>")
+  set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE_SUPPORTED TRUE)
+endif()
+
+
 macro(__windows_compiler_msvc lang)
 macro(__windows_compiler_msvc lang)
   if(NOT MSVC_VERSION LESS 1400)
   if(NOT MSVC_VERSION LESS 1400)
     # for 2005 make sure the manifest is put in the dll with mt
     # for 2005 make sure the manifest is put in the dll with mt

+ 12 - 2
Tests/RunCMake/target_link_libraries-LINK_LIBRARY/RunCMakeTest.cmake

@@ -67,8 +67,8 @@ if ((RunCMake_GENERATOR MATCHES "Makefiles|Ninja|Xcode"
   if(CMAKE_C_COMPILER_ID STREQUAL "AppleClang"
   if(CMAKE_C_COMPILER_ID STREQUAL "AppleClang"
       OR (CMAKE_C_COMPILER_ID STREQUAL "MSVC" AND MSVC_VERSION GREATER "1900")
       OR (CMAKE_C_COMPILER_ID STREQUAL "MSVC" AND MSVC_VERSION GREATER "1900")
       OR (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_SYSTEM_NAME STREQUAL "Linux"))
       OR (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_SYSTEM_NAME STREQUAL "Linux"))
-    run_cmake(whole_archive)
-    run_cmake_target(whole_archive link-exe main)
+    run_cmake(load_archive)
+    run_cmake_target(load_archive link-exe main)
   endif()
   endif()
   if(CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
   if(CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
     run_cmake(weak_library)
     run_cmake(weak_library)
@@ -110,3 +110,13 @@ endif()
 if (CMAKE_C_COMPILER_ID STREQUAL "AppleClang" AND CMAKE_C_COMPILER_VERSION GREATER_EQUAL "12")
 if (CMAKE_C_COMPILER_ID STREQUAL "AppleClang" AND CMAKE_C_COMPILER_VERSION GREATER_EQUAL "12")
   run_cmake_target(apple_library needed_library main-needed_library)
   run_cmake_target(apple_library needed_library main-needed_library)
 endif()
 endif()
+
+# WHOLE_ARCHIVE feature
+if ((CMAKE_SYSTEM_NAME STREQUAL "Windows" AND
+      ((DEFINED MSVC_VERSION AND MSVC_VERSION GREATER "1900") OR (CMAKE_C_COMPILER_ID MATCHES "GNU|Clang" AND NOT CMAKE_C_SIMULATE_ID STREQUAL "MSVC")))
+    OR (CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND
+      (NOT CMAKE_C_COMPILER_ID STREQUAL "SunPro" OR CMAKE_C_COMPILER_VERSION GREATER "5.9"))
+    OR CMAKE_SYSTEM_NAME MATCHES "Darwin|iOS|tvOS|watchOS|Linux|BSD|MSYS|CYGWIN")
+  run_cmake(feature-WHOLE_ARCHIVE)
+  run_cmake_target(feature-WHOLE_ARCHIVE link-exe main)
+endif()

+ 11 - 0
Tests/RunCMake/target_link_libraries-LINK_LIBRARY/feature-WHOLE_ARCHIVE.cmake

@@ -0,0 +1,11 @@
+
+enable_language(C)
+
+add_library(base STATIC base.c unref.c)
+target_compile_definitions(base PUBLIC STATIC_BASE)
+
+add_library(lib SHARED lib.c)
+target_link_libraries(lib PRIVATE "$<LINK_LIBRARY:WHOLE_ARCHIVE,base>")
+
+add_executable(main main.c)
+target_link_libraries(main PRIVATE lib)

+ 34 - 0
Tests/RunCMake/target_link_libraries-LINK_LIBRARY/load_archive.cmake

@@ -0,0 +1,34 @@
+
+enable_language(C)
+
+set(CMAKE_C_LINK_LIBRARY_USING_load_archive_SUPPORTED TRUE)
+if(CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
+  set(CMAKE_C_LINK_LIBRARY_USING_load_archive "-force_load <LIB_ITEM>")
+elseif(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  execute_process(COMMAND "${CMAKE_LINKER}" --help
+                          OUTPUT_VARIABLE linker_help
+                          ERROR_VARIABLE linker_help)
+  if(linker_help MATCHES "--push-state" AND linker_help MATCHES "--pop-state")
+    set(CMAKE_C_LINK_LIBRARY_USING_load_archive "LINKER:--push-state,--whole-archive"
+                                                "<LINK_ITEM>"
+                                                "LINKER:--pop-state")
+  else()
+    set(CMAKE_C_LINK_LIBRARY_USING_load_archive "LINKER:--whole-archive"
+                                                "<LINK_ITEM>"
+                                                "LINKER:--no-whole-archive")
+  endif()
+elseif(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
+  set(CMAKE_C_LINK_LIBRARY_USING_load_archive "/WHOLEARCHIVE:<LIBRARY>")
+else()
+  # feature not yet supported for the other environments
+  set(CMAKE_C_LINK_LIBRARY_USING_load_archive_SUPPORTED FALSE)
+endif()
+
+add_library(base STATIC base.c unref.c)
+target_compile_definitions(base PUBLIC STATIC_BASE)
+
+add_library(lib SHARED lib.c)
+target_link_libraries(lib PRIVATE "$<LINK_LIBRARY:load_archive,base>")
+
+add_executable(main main.c)
+target_link_libraries(main PRIVATE lib)

+ 0 - 34
Tests/RunCMake/target_link_libraries-LINK_LIBRARY/whole_archive.cmake

@@ -1,34 +0,0 @@
-
-enable_language(C)
-
-set(CMAKE_C_LINK_LIBRARY_USING_whole_archive_SUPPORTED TRUE)
-if(CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
-  set(CMAKE_C_LINK_LIBRARY_USING_whole_archive "-force_load <LIB_ITEM>")
-elseif(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
-  execute_process(COMMAND "${CMAKE_LINKER}" --help
-                          OUTPUT_VARIABLE linker_help
-                          ERROR_VARIABLE linker_help)
-  if(linker_help MATCHES "--push-state" AND linker_help MATCHES "--pop-state")
-    set(CMAKE_C_LINK_LIBRARY_USING_whole_archive "LINKER:--push-state,--whole-archive"
-                                                 "<LINK_ITEM>"
-                                                 "LINKER:--pop-state")
-  else()
-    set(CMAKE_C_LINK_LIBRARY_USING_whole_archive "LINKER:--whole-archive"
-                                                 "<LINK_ITEM>"
-                                                 "LINKER:--no-whole-archive")
-  endif()
-elseif(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
-  set(CMAKE_C_LINK_LIBRARY_USING_whole_archive "/WHOLEARCHIVE:<LIBRARY>")
-else()
-  # feature not yet supported for the other environments
-  set(CMAKE_C_LINK_LIBRARY_USING_whole_archive_SUPPORTED FALSE)
-endif()
-
-add_library(base STATIC base.c unref.c)
-target_compile_definitions(base PUBLIC STATIC_BASE)
-
-add_library(lib SHARED lib.c)
-target_link_libraries(lib PRIVATE "$<LINK_LIBRARY:whole_archive,base>")
-
-add_executable(main main.c)
-target_link_libraries(main PRIVATE lib)