From 4d2c1004e96faad1179591b4409a75965af43985 Mon Sep 17 00:00:00 2001 From: dundargoc <33953936+dundargoc@users.noreply.github.com> Date: Wed, 8 Feb 2023 11:00:16 +0100 Subject: build: prefer -D = over -D= (#22164) This makes it easier to see that -D is referring to the entire "=", rather than only . It also help syntax highlighters highlight built-in variables. --- cmake/WindowsDllCopy.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cmake/WindowsDllCopy.cmake') diff --git a/cmake/WindowsDllCopy.cmake b/cmake/WindowsDllCopy.cmake index fbbabf3a0c..c07dc51b8a 100644 --- a/cmake/WindowsDllCopy.cmake +++ b/cmake/WindowsDllCopy.cmake @@ -6,13 +6,13 @@ # - CMAKE_PREFIX_PATH: A list of directories to search for dependencies if(NOT DEFINED BINARY) - message(FATAL_ERROR "Missing required argument -DBINARY=") + message(FATAL_ERROR "Missing required argument -D BINARY=") endif() if(NOT DEFINED DST) - message(FATAL_ERROR "Missing required arguments -DDST=") + message(FATAL_ERROR "Missing required arguments -D DST=") endif() if(NOT DEFINED CMAKE_PREFIX_PATH) - message(FATAL_ERROR "Missing required arguments -DCMAKE_PREFIX_PATH=") + message(FATAL_ERROR "Missing required arguments -D CMAKE_PREFIX_PATH=") endif() include(GetPrerequisites) -- cgit From b4a92309f8f5ee4e579cee72ef352451a60733b8 Mon Sep 17 00:00:00 2001 From: Enan Ajmain <3nan.ajmain@gmail.com> Date: Tue, 14 Feb 2023 23:58:38 +0600 Subject: ci: print DLL copy messages only in CI environment (#22260) In Windows, library DLL's are copied in the building process, and a message for each copy is printed. This is useful to have in the log of CI, but annoying to see when you're building and rebuilding nvim constantly. Work around this issue by only enabling the messages on CI. --- cmake/WindowsDllCopy.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'cmake/WindowsDllCopy.cmake') diff --git a/cmake/WindowsDllCopy.cmake b/cmake/WindowsDllCopy.cmake index c07dc51b8a..b51e66e5cc 100644 --- a/cmake/WindowsDllCopy.cmake +++ b/cmake/WindowsDllCopy.cmake @@ -23,8 +23,9 @@ foreach(DLL_NAME ${DLLS}) message(FATAL_ERROR "Unable to find dependency ${DLL_NAME}") endif() - message("Copying ${DLL_NAME} to ${DST}") + if($ENV{CI} MATCHES "true") + message("Copying ${DLL_NAME} to ${DST}") + endif() execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${DLL_PATH} ${DST}) unset(DLL_PATH CACHE) endforeach() - -- cgit From c50951a4d0cf480aa138a2ed2bd2deedebeb0dec Mon Sep 17 00:00:00 2001 From: dundargoc <33953936+dundargoc@users.noreply.github.com> Date: Mon, 4 Sep 2023 00:00:26 +0200 Subject: build: various fixes - simplify lua interpreter search - fix incorrect variable name in BuildLua.cmake - build PUC Lua with -O2 - silence non-mandatory find_package search for libuv - simplify Find modules - Prefer using the explicitly set CI_BUILD over relying on the environment variable "CI". --- cmake/WindowsDllCopy.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmake/WindowsDllCopy.cmake') diff --git a/cmake/WindowsDllCopy.cmake b/cmake/WindowsDllCopy.cmake index b51e66e5cc..c972d88f57 100644 --- a/cmake/WindowsDllCopy.cmake +++ b/cmake/WindowsDllCopy.cmake @@ -23,7 +23,7 @@ foreach(DLL_NAME ${DLLS}) message(FATAL_ERROR "Unable to find dependency ${DLL_NAME}") endif() - if($ENV{CI} MATCHES "true") + if(CI_BUILD) message("Copying ${DLL_NAME} to ${DST}") endif() execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${DLL_PATH} ${DST}) -- cgit