Merge pull request #20732 from dundargoc/build/default-cmake-args

build: refactor cmake files
2024-09-17 20:58:20 -04:00 · 2022-11-05 22:07:25 +01:00 · 2022-11-05 22:07:25 +01:00 · 8765c7e288
commit 8765c7e288
parent d5dd7573f3 45c8679493
11 changed files with 35 additions and 26 deletions
--- a/cmake.deps/cmake/BuildGettext.cmake
+++ b/cmake.deps/cmake/BuildGettext.cmake
@ -7,18 +7,16 @@ if(MSVC)
    URL_HASH SHA256=${GETTEXT_SHA256}
    DOWNLOAD_NO_PROGRESS TRUE
    DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/gettext
-    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy
+    PATCH_COMMAND ${CMAKE_COMMAND} -E copy
      ${CMAKE_CURRENT_SOURCE_DIR}/cmake/GettextCMakeLists.txt
-        ${DEPS_BUILD_DIR}/src/gettext/CMakeLists.txt
-      COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/gettext
-        -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
-        ${BUILD_TYPE_STRING}
-        -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
-        -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
-        -DLIBICONV_INCLUDE_DIRS=${DEPS_INSTALL_DIR}/include
-        -DLIBICONV_LIBRARIES=${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}libcharset${CMAKE_STATIC_LIBRARY_SUFFIX}$<SEMICOLON>${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}libiconv${CMAKE_STATIC_LIBRARY_SUFFIX}
-    BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
-    INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config $<CONFIG>)
+      ${DEPS_BUILD_DIR}/src/gettext/CMakeLists.txt
+    CMAKE_ARGS
+      -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
+      ${BUILD_TYPE_STRING}
+      -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+      -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
+      -DLIBICONV_INCLUDE_DIRS=${DEPS_INSTALL_DIR}/include
+      -DLIBICONV_LIBRARIES=${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}libcharset${CMAKE_STATIC_LIBRARY_SUFFIX}$<SEMICOLON>${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}libiconv${CMAKE_STATIC_LIBRARY_SUFFIX})
 else()
  message(FATAL_ERROR "Trying to build gettext in an unsupported system ${CMAKE_SYSTEM_NAME}/${CMAKE_C_COMPILER_ID}")
 endif()
--- a/cmake.deps/cmake/BuildLibiconv.cmake
+++ b/cmake.deps/cmake/BuildLibiconv.cmake
@ -7,16 +7,14 @@ if(MSVC)
    URL_HASH SHA256=${LIBICONV_SHA256}
    DOWNLOAD_NO_PROGRESS TRUE
    DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/libiconv
-    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy
+    PATCH_COMMAND ${CMAKE_COMMAND} -E copy
      ${CMAKE_CURRENT_SOURCE_DIR}/cmake/LibiconvCMakeLists.txt
-        ${DEPS_BUILD_DIR}/src/libiconv/CMakeLists.txt
-      COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/libiconv
-        -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
-        ${BUILD_TYPE_STRING}
-        -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
-        -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
-    BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
-    INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config $<CONFIG>)
+      ${DEPS_BUILD_DIR}/src/libiconv/CMakeLists.txt
+    CMAKE_ARGS
+      -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
+      ${BUILD_TYPE_STRING}
+      -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+      -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM})
 else()
  message(FATAL_ERROR "Trying to build libiconv in an unsupported system ${CMAKE_SYSTEM_NAME}/${CMAKE_C_COMPILER_ID}")
 endif()
--- a/cmake.deps/cmake/BuildMsgpack.cmake
+++ b/cmake.deps/cmake/BuildMsgpack.cmake
@ -1,4 +1,4 @@
-set(MSGPACK_CONFIGURE_COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/msgpack
+set(MSGPACK_CMAKE_ARGS
  -DMSGPACK_BUILD_TESTS=OFF
  -DMSGPACK_BUILD_EXAMPLES=OFF
  -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
@ -8,8 +8,7 @@ set(MSGPACK_CONFIGURE_COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/msgpack
  -DCMAKE_GENERATOR=${CMAKE_GENERATOR})

 if(MSVC)
-  # Same as Unix without fPIC
-  set(MSGPACK_CONFIGURE_COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/msgpack
+  set(MSGPACK_CMAKE_ARGS
    -DMSGPACK_BUILD_TESTS=OFF
    -DMSGPACK_BUILD_EXAMPLES=OFF
    -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
@ -29,9 +28,7 @@ ExternalProject_Add(msgpack
  URL_HASH SHA256=${MSGPACK_SHA256}
  DOWNLOAD_NO_PROGRESS TRUE
  DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/msgpack
-  CONFIGURE_COMMAND "${MSGPACK_CONFIGURE_COMMAND}"
-  BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
-  INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config $<CONFIG>
+  CMAKE_ARGS "${MSGPACK_CMAKE_ARGS}"
  LIST_SEPARATOR |)

 list(APPEND THIRD_PARTY_DEPS msgpack)
--- a/cmake.deps/cmake/GettextCMakeLists.txt
+++ b/cmake.deps/cmake/GettextCMakeLists.txt
@ -327,3 +327,5 @@ install(TARGETS libintl msgmerge msgfmt xgettext
  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+# vim: set ft=cmake:
--- a/cmake.deps/cmake/LibiconvCMakeLists.txt
+++ b/cmake.deps/cmake/LibiconvCMakeLists.txt
@ -95,3 +95,5 @@ install(TARGETS libcharset libiconv iconv
  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+# vim: set ft=cmake:
--- a/cmake.deps/cmake/LibvtermCMakeLists.txt
+++ b/cmake.deps/cmake/LibvtermCMakeLists.txt
@ -82,3 +82,5 @@ if(Perl_FOUND)
      DEPENDS ${header_path} ${perl_header_path})
  endforeach()
 endif()
+
+# vim: set ft=cmake:
--- a/cmake.deps/cmake/TreesitterCMakeLists.txt
+++ b/cmake.deps/cmake/TreesitterCMakeLists.txt
@ -19,3 +19,5 @@ install(FILES
 include(GNUInstallDirs)
 install(TARGETS tree-sitter
  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+# vim: set ft=cmake:
--- a/cmake.deps/cmake/TreesitterParserCMakeLists.txt
+++ b/cmake.deps/cmake/TreesitterParserCMakeLists.txt
@ -19,3 +19,5 @@ set_target_properties(
 include_directories(src)

 install(TARGETS parser LIBRARY DESTINATION lib/nvim/parser)
+
+# vim: set ft=cmake:
--- a/cmake.deps/cmake/UnibiliumCMakeLists.txt
+++ b/cmake.deps/cmake/UnibiliumCMakeLists.txt
@ -23,3 +23,5 @@ install(TARGETS unibilium
  PUBLIC_HEADER
  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
+# vim: set ft=cmake:
--- a/cmake.deps/cmake/libtermkeyCMakeLists.txt
+++ b/cmake.deps/cmake/libtermkeyCMakeLists.txt
@ -32,3 +32,5 @@ foreach(f ${TESTSOURCES})
  target_link_libraries("test_${t}" termkey)
  add_test("${t}" "test_${t}")
 endforeach()
+
+# vim: set ft=cmake:
--- a/cmake/GenerateVersion.cmake
+++ b/cmake/GenerateVersion.cmake
@ -16,7 +16,9 @@ endif()
 # `git describe` annotates the most recent tagged release; for pre-release
 # builds we append that to the dev version.
 if(NVIM_VERSION_PRERELEASE)
+  # Extract pre-release info: "v0.8.0-145-g0f9113907" => "145-g0f9113907"
  string(REGEX REPLACE "^v[0-9]+.[0-9]+.[0-9]+-" "" NVIM_VERSION_GIT "${GIT_TAG}")
+  # Replace "-" with "+": "145-g0f9113907" => "145+g0f9113907"
  string(REGEX REPLACE "^([0-9]+)-([a-z0-9]+)" "\\1+\\2" NVIM_VERSION_GIT "${NVIM_VERSION_GIT}")
  set(NVIM_VERSION "${NVIM_VERSION}-${NVIM_VERSION_GIT}")
 endif()