diff options
Diffstat (limited to 'third-party/cmake')
| -rw-r--r-- | third-party/cmake/BuildJeMalloc.cmake | 4 | ||||
| -rw-r--r-- | third-party/cmake/BuildMsgpack.cmake | 4 | ||||
| -rw-r--r-- | third-party/cmake/InstallMsgpack.cmake | 12 | ||||
| -rw-r--r-- | third-party/cmake/RemoveFiles.cmake | 5 |
4 files changed, 8 insertions, 17 deletions
diff --git a/third-party/cmake/BuildJeMalloc.cmake b/third-party/cmake/BuildJeMalloc.cmake index ceb7de41e9..c3a0d890fc 100644 --- a/third-party/cmake/BuildJeMalloc.cmake +++ b/third-party/cmake/BuildJeMalloc.cmake @@ -11,8 +11,8 @@ ExternalProject_Add(jemalloc -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake BUILD_IN_SOURCE 1 CONFIGURE_COMMAND sh ${DEPS_BUILD_DIR}/src/jemalloc/autogen.sh && - ${DEPS_BUILD_DIR}/src/jemalloc/configure --with-jemalloc-prefix=je_ - --enable-cc-silence CC=${DEPS_C_COMPILER} --prefix=${DEPS_INSTALL_DIR} + ${DEPS_BUILD_DIR}/src/jemalloc/configure --enable-cc-silence + CC=${DEPS_C_COMPILER} --prefix=${DEPS_INSTALL_DIR} BUILD_COMMAND "" INSTALL_COMMAND ${MAKE_PRG} install_include install_lib) diff --git a/third-party/cmake/BuildMsgpack.cmake b/third-party/cmake/BuildMsgpack.cmake index 9368fed71a..b9036718e6 100644 --- a/third-party/cmake/BuildMsgpack.cmake +++ b/third-party/cmake/BuildMsgpack.cmake @@ -17,8 +17,6 @@ ExternalProject_Add(msgpack -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_COMPILER_ARG1} -fPIC" BUILD_COMMAND ${CMAKE_COMMAND} --build . - INSTALL_COMMAND ${CMAKE_COMMAND} - -DREMOVE_FILE_GLOB=${DEPS_INSTALL_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}msgpack*${CMAKE_SHARED_LIBRARY_SUFFIX}* - -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/InstallMsgpack.cmake) + INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install) list(APPEND THIRD_PARTY_DEPS msgpack) diff --git a/third-party/cmake/InstallMsgpack.cmake b/third-party/cmake/InstallMsgpack.cmake deleted file mode 100644 index 406f299723..0000000000 --- a/third-party/cmake/InstallMsgpack.cmake +++ /dev/null @@ -1,12 +0,0 @@ -execute_process( - COMMAND ${CMAKE_COMMAND} --build . --target install - RESULT_VARIABLE res) - -if(NOT res EQUAL 0) - message(FATAL_ERROR "Installing msgpack failed.") -endif() - -file(GLOB_RECURSE FILES_TO_REMOVE ${REMOVE_FILE_GLOB}) -if(FILES_TO_REMOVE) - file(REMOVE ${FILES_TO_REMOVE}) -endif() diff --git a/third-party/cmake/RemoveFiles.cmake b/third-party/cmake/RemoveFiles.cmake new file mode 100644 index 0000000000..88e2bc70a6 --- /dev/null +++ b/third-party/cmake/RemoveFiles.cmake @@ -0,0 +1,5 @@ +file(GLOB_RECURSE FILES_TO_REMOVE ${REMOVE_FILE_GLOB}) + +if(FILES_TO_REMOVE) + file(REMOVE ${FILES_TO_REMOVE}) +endif() |