diff options
| author | Florian Walch <florian@fwalch.com> | 2015-04-20 13:37:07 +0300 |
|---|---|---|
| committer | Florian Walch <florian@fwalch.com> | 2015-04-29 22:26:55 +0300 |
| commit | 9a08aa80f7e7ee322e1075547187c1d7ac7064c5 (patch) | |
| tree | e78c1c8ff2f184ecd454cefba7674cb16f88c275 | |
| parent | 2446b997c63b8a2aa75493f546918cb69c6a4111 (diff) | |
| download | rneovim-9a08aa80f7e7ee322e1075547187c1d7ac7064c5.tar.gz rneovim-9a08aa80f7e7ee322e1075547187c1d7ac7064c5.tar.bz2 rneovim-9a08aa80f7e7ee322e1075547187c1d7ac7064c5.zip | |
deps: Remove shared libraries.
| -rw-r--r-- | third-party/CMakeLists.txt | 9 | ||||
| -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, 14 insertions, 16 deletions
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index fde367bc72..ab36cb67c6 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -109,6 +109,13 @@ if(USE_BUNDLED_JEMALLOC) include(BuildJeMalloc) endif() +add_custom_target(clean-shared-libraries + COMMAND ${CMAKE_COMMAND} + -DREMOVE_FILE_GLOB=${DEPS_INSTALL_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}*${CMAKE_SHARED_LIBRARY_SUFFIX}* + -P ${PROJECT_SOURCE_DIR}/cmake/RemoveFiles.cmake + DEPENDS ${THIRD_PARTY_DEPS} +) + add_custom_target(third-party ALL COMMAND ${CMAKE_COMMAND} -E touch .third-party - DEPENDS ${THIRD_PARTY_DEPS}) + DEPENDS clean-shared-libraries) 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() |