3party/pugixml
0
0
Fork 0
mirror of https://github.com/zeux/pugixml.git synced 2024-12-27 13:33:17 +08:00
Code Issues Projects Releases Wiki Activity

Reverted to use of global BUILD_SHARED_LIBS option

Browse Source 
This commit reverts back to exposing the global variable
BUILD_SHARED_LIBS.

Since building static libraries are the default for CMake
(i.e. BUILD_SHARED_LIBS=OFF) the option to build both static and shared
libraries were moved into a conditional option. So the option
PUGIXML_BUILD_SHARED_AND_STATIC is now only visible when the global
BUILD_SHARED_LIBS variable is set to ON.

The change also prevents the case were the user first enables
BUILD_SHARED_LIBS and then enables PUGIXML_BUILD_SHARED_AND_STATIC to
then again disable BUILD_SHARED_LIBS.
This commit is contained in:
Björn Blissing 2021-06-19 12:51:27 +02:00
parent fc7928a4b7
commit 7b1b7ee16d
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CMakeLists.txt
View File

@ -27,12 +27,13 @@ cmake_dependent_option(PUGIXML_BUILD_TESTS
set(PUGIXML_BUILD_DEFINES CACHE STRING "Build defines for custom options") set(PUGIXML_BUILD_DEFINES CACHE STRING "Build defines for custom options")
separate_arguments(PUGIXML_BUILD_DEFINES) separate_arguments(PUGIXML_BUILD_DEFINES)
option(PUGIXML_BUILD_SHARED_AND_STATIC_LIBS "Build both shared and static libraries" OFF) # Technically not needed for this file. This is builtin CMAKE global variable.
option(BUILD_SHARED_LIBS "Build shared instead of static library" OFF)
# Expose option to build PUGIXML as static even when the global BUILD_SHARED_LIBS variable is set # Expose option to build PUGIXML as static as well when the global BUILD_SHARED_LIBS variable is set
cmake_dependent_option(PUGIXML_BUILD_SHARED_LIBS cmake_dependent_option(PUGIXML_BUILD_SHARED_AND_STATIC_LIBS
"Build shared instead of static library" OFF "Build both shared and static libraries" OFF
"BUILD_SHARED_LIBS" ON) "BUILD_SHARED_LIBS" OFF)
# This is used to backport a CMake 3.15 feature, but is also forwards compatible # This is used to backport a CMake 3.15 feature, but is also forwards compatible
if (NOT DEFINED CMAKE_MSVC_RUNTIME_LIBRARY) if (NOT DEFINED CMAKE_MSVC_RUNTIME_LIBRARY)
@ -73,7 +74,7 @@ set(versioned-dir $<$<BOOL:${PUGIXML_USE_VERSIONED_LIBDIR}>:/pugixml-${PROJECT_V
set(libs) set(libs)
if (PUGIXML_BUILD_SHARED_LIBS OR PUGIXML_BUILD_SHARED_AND_STATIC_LIBS) if (BUILD_SHARED_LIBS)
add_library(pugixml-shared SHARED add_library(pugixml-shared SHARED
${PROJECT_SOURCE_DIR}/scripts/pugixml_dll.rc ${PROJECT_SOURCE_DIR}/scripts/pugixml_dll.rc
${PROJECT_SOURCE_DIR}/src/pugixml.cpp) ${PROJECT_SOURCE_DIR}/src/pugixml.cpp)
@ -97,7 +98,7 @@ if (PUGIXML_BUILD_SHARED_LIBS OR PUGIXML_BUILD_SHARED_AND_STATIC_LIBS)
${msvc-rt-mt-static}) ${msvc-rt-mt-static})
endif() endif()
if (NOT PUGIXML_BUILD_SHARED_LIBS OR PUGIXML_BUILD_SHARED_AND_STATIC_LIBS) if (NOT BUILD_SHARED_LIBS OR PUGIXML_BUILD_SHARED_AND_STATIC_LIBS)
add_library(pugixml-static STATIC add_library(pugixml-static STATIC
${PROJECT_SOURCE_DIR}/src/pugixml.cpp) ${PROJECT_SOURCE_DIR}/src/pugixml.cpp)
add_library(pugixml::static ALIAS pugixml-static) add_library(pugixml::static ALIAS pugixml-static)
@ -118,7 +119,7 @@ if (NOT PUGIXML_BUILD_SHARED_LIBS OR PUGIXML_BUILD_SHARED_AND_STATIC_LIBS)
${msvc-rt-mt-static}) ${msvc-rt-mt-static})
endif() endif()
if (PUGIXML_BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)
set(pugixml-alias pugixml-shared) set(pugixml-alias pugixml-shared)
else() else()
set(pugixml-alias pugixml-static) set(pugixml-alias pugixml-static)