From 06addcfaa956d5cffeba10ff9e41c4e8e2a33d1d Mon Sep 17 00:00:00 2001 From: dundargoc Date: Sun, 11 Sep 2022 13:39:49 +0200 Subject: build: remove unused variable CMAKE_C_COMPILER_ARG1 It was set in file cmake/i386-linux-gnu.toolchain.cmake which has been removed since we don't use Travis anymore. --- cmake/GetCompileFlags.cmake | 8 -------- 1 file changed, 8 deletions(-) (limited to 'cmake') diff --git a/cmake/GetCompileFlags.cmake b/cmake/GetCompileFlags.cmake index 49b57f6f75..3b027690f8 100644 --- a/cmake/GetCompileFlags.cmake +++ b/cmake/GetCompileFlags.cmake @@ -2,14 +2,6 @@ function(get_compile_flags _compile_flags) # Create template akin to CMAKE_C_COMPILE_OBJECT. set(compile_flags " ") - # Get C compiler. - if(CMAKE_C_COMPILER_ARG1) - string(REPLACE - "" - " ${CMAKE_C_COMPILER_ARG1}" - compile_flags - "${compile_flags}") - endif() string(REPLACE "" "${CMAKE_C_COMPILER}" -- cgit From 913651d1f102eed11db9046fdec72e84958a7c6a Mon Sep 17 00:00:00 2001 From: dundargoc Date: Mon, 26 Sep 2022 11:39:31 +0200 Subject: build: remove unnecessary translation-related code The commands run in cmake script mode (-P) can simply be run in the main cmake run instead. --- cmake/RunMsgfmt.cmake | 9 --------- cmake/RunMsgmerge.cmake | 11 ----------- cmake/RunXgettext.cmake | 14 -------------- 3 files changed, 34 deletions(-) delete mode 100644 cmake/RunMsgfmt.cmake delete mode 100644 cmake/RunMsgmerge.cmake delete mode 100644 cmake/RunXgettext.cmake (limited to 'cmake') diff --git a/cmake/RunMsgfmt.cmake b/cmake/RunMsgfmt.cmake deleted file mode 100644 index 51606338e0..0000000000 --- a/cmake/RunMsgfmt.cmake +++ /dev/null @@ -1,9 +0,0 @@ -set(ENV{OLD_PO_FILE_INPUT} yes) - -execute_process( - COMMAND ${MSGFMT_PRG} -o ${MO_FILE} ${PO_FILE} - ERROR_VARIABLE err - RESULT_VARIABLE res) -if(NOT res EQUAL 0) - message(FATAL_ERROR "msgfmt failed to run correctly: ${err}") -endif() diff --git a/cmake/RunMsgmerge.cmake b/cmake/RunMsgmerge.cmake deleted file mode 100644 index 69e5c7276d..0000000000 --- a/cmake/RunMsgmerge.cmake +++ /dev/null @@ -1,11 +0,0 @@ -set(ENV{OLD_PO_FILE_INPUT} yes) -set(ENV{OLD_PO_FILE_OUTPUT} yes) - -execute_process( - COMMAND ${MSGMERGE_PRG} -q --update --backup=none --sort-by-file - ${PO_FILE} ${POT_FILE} - ERROR_VARIABLE err - RESULT_VARIABLE res) -if(NOT res EQUAL 0) - message(FATAL_ERROR "msgmerge failed to run correctly: ${err}") -endif() diff --git a/cmake/RunXgettext.cmake b/cmake/RunXgettext.cmake deleted file mode 100644 index c9328b151d..0000000000 --- a/cmake/RunXgettext.cmake +++ /dev/null @@ -1,14 +0,0 @@ -set(ENV{OLD_PO_FILE_INPUT} yes) -set(ENV{OLD_PO_FILE_OUTPUT} yes) - -list(SORT SOURCES) - -execute_process( - COMMAND ${XGETTEXT_PRG} -o ${POT_FILE} --default-domain=nvim - --add-comments --keyword=_ --keyword=N_ -D ${SEARCH_DIR} - ${SOURCES} - ERROR_VARIABLE err - RESULT_VARIABLE res) -if(NOT res EQUAL 0) - message(FATAL_ERROR "xgettext failed to run correctly: ${err}") -endif() -- cgit