diff options
Diffstat (limited to 'cmake.deps/cmake/BuildMsgpack.cmake')
| -rw-r--r-- | cmake.deps/cmake/BuildMsgpack.cmake | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/cmake.deps/cmake/BuildMsgpack.cmake b/cmake.deps/cmake/BuildMsgpack.cmake index 3197ec45a1..9d112c57b1 100644 --- a/cmake.deps/cmake/BuildMsgpack.cmake +++ b/cmake.deps/cmake/BuildMsgpack.cmake @@ -1,23 +1,15 @@ set(MSGPACK_CMAKE_ARGS - -DMSGPACK_BUILD_TESTS=OFF - -DMSGPACK_BUILD_EXAMPLES=OFF - -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR} - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} - -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES_ALT_SEP} - "-DCMAKE_C_FLAGS:STRING=-fPIC" - -DCMAKE_GENERATOR=${CMAKE_GENERATOR}) - -if(MSVC) - set(MSGPACK_CMAKE_ARGS -DMSGPACK_BUILD_TESTS=OFF -DMSGPACK_BUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} + -DCMAKE_GENERATOR=${CMAKE_GENERATOR} -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM} - ${BUILD_TYPE_STRING} - # Make sure we use the same generator, otherwise we may - # accidentally end up using different MSVC runtimes - -DCMAKE_GENERATOR=${CMAKE_GENERATOR}) + ${BUILD_TYPE_STRING}) + +if(NOT MSVC) + list(APPEND MSGPACK_CMAKE_ARGS + "-DCMAKE_C_FLAGS:STRING=-fPIC") endif() if(USE_EXISTING_SRC_DIR) @@ -29,6 +21,7 @@ ExternalProject_Add(msgpack DOWNLOAD_NO_PROGRESS TRUE DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/msgpack CMAKE_ARGS "${MSGPACK_CMAKE_ARGS}" - LIST_SEPARATOR |) + CMAKE_CACHE_ARGS + -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}) list(APPEND THIRD_PARTY_DEPS msgpack) |