diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-08-15 13:56:20 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-08-15 13:56:20 -0700 |
| commit | 28ae8e94d5ba7c285dde6b8820b3bd56f5f775f7 (patch) | |
| tree | a7952616386d4fa19ee9f44aff204e27de85f249 /ports/msgpack/add-static-lib-option.patch | |
| parent | 957cb214e92f45069f142d8b6ccf2a6425df9c51 (diff) | |
| parent | cd7f4cccffd915edc2d4b625ff32dea970ec073f (diff) | |
| download | vcpkg-28ae8e94d5ba7c285dde6b8820b3bd56f5f775f7.tar.gz vcpkg-28ae8e94d5ba7c285dde6b8820b3bd56f5f775f7.zip | |
Merge branch 'master' into qualifier_change
Diffstat (limited to 'ports/msgpack/add-static-lib-option.patch')
| -rw-r--r-- | ports/msgpack/add-static-lib-option.patch | 84 |
1 files changed, 84 insertions, 0 deletions
diff --git a/ports/msgpack/add-static-lib-option.patch b/ports/msgpack/add-static-lib-option.patch new file mode 100644 index 000000000..349a413fb --- /dev/null +++ b/ports/msgpack/add-static-lib-option.patch @@ -0,0 +1,84 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f92363e..b0becbb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -196,27 +196,28 @@ IF (MSGPACK_ENABLE_SHARED) + ${CMAKE_CURRENT_SOURCE_DIR} + ) + ENDIF () ++IF (MSGPACK_ENABLE_STATIC) ++ ADD_LIBRARY (msgpackc-static STATIC ++ ${msgpackc_SOURCES} ++ ${msgpackc_HEADERS} ++ ) + +-ADD_LIBRARY (msgpackc-static STATIC +- ${msgpackc_SOURCES} +- ${msgpackc_HEADERS} +-) +- +-TARGET_INCLUDE_DIRECTORIES (msgpackc-static +- PUBLIC +- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> +- $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include> +- $<INSTALL_INTERFACE:include> +- PRIVATE +- ${CMAKE_CURRENT_SOURCE_DIR} +-) ++ TARGET_INCLUDE_DIRECTORIES (msgpackc-static ++ PUBLIC ++ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> ++ $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include> ++ $<INSTALL_INTERFACE:include> ++ PRIVATE ++ ${CMAKE_CURRENT_SOURCE_DIR} ++ ) ++ SET_TARGET_PROPERTIES (msgpackc-static PROPERTIES OUTPUT_NAME "msgpackc" COMPILE_DEFINITIONS MSGPACK_DLLEXPORT=) ++ENDIF () + +-IF (NOT MSGPACK_ENABLE_SHARED) ++IF (MSGPACK_ENABLE_STATIC AND NOT MSGPACK_ENABLE_SHARED) + # Add alias for subdirectories + ADD_LIBRARY (msgpackc ALIAS msgpackc-static) + ENDIF () + +-SET_TARGET_PROPERTIES (msgpackc-static PROPERTIES OUTPUT_NAME "msgpackc") + IF (MSGPACK_ENABLE_SHARED) + IF (MSVC) + SET_TARGET_PROPERTIES (msgpackc PROPERTIES IMPORT_SUFFIX "_import.lib") +@@ -239,14 +240,18 @@ IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" ST + IF (MSGPACK_ENABLE_SHARED) + SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3 -DPIC") + ENDIF () +- SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3" ) ++ IF (MSGPACK_ENABLE_STATIC) ++ SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3" ) ++ ENDIF () + ENDIF () + + IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + IF (MSGPACK_ENABLE_SHARED) + SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags") + ENDIF () +- SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags") ++ IF (MSGPACK_ENABLE_STATIC) ++ SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags") ++ ENDIF () + ENDIF () + + IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") +@@ -278,10 +283,12 @@ IF (MSGPACK_BUILD_EXAMPLES) + ADD_SUBDIRECTORY (example) + ENDIF () + +-IF (MSGPACK_ENABLE_SHARED) ++IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC) + SET (MSGPACK_INSTALLTARGETS msgpackc msgpackc-static) +-ELSE() ++ELSEIF (MSGPACK_ENABLE_STATIC) + SET (MSGPACK_INSTALLTARGETS msgpackc-static) ++ELSE () ++ SET (MSGPACK_INSTALLTARGETS msgpackc) + ENDIF () + + INSTALL (TARGETS ${MSGPACK_INSTALLTARGETS} EXPORT msgpack-targets |