diff options
Diffstat (limited to 'cmake.deps/cmake')
-rw-r--r-- | cmake.deps/cmake/BuildGettext.cmake | 4 | ||||
-rw-r--r-- | cmake.deps/cmake/BuildLibiconv.cmake | 4 | ||||
-rw-r--r-- | cmake.deps/cmake/BuildLibuv.cmake | 4 | ||||
-rw-r--r-- | cmake.deps/cmake/BuildLibvterm.cmake | 4 | ||||
-rw-r--r-- | cmake.deps/cmake/BuildLpeg.cmake | 4 | ||||
-rw-r--r-- | cmake.deps/cmake/BuildLua.cmake | 3 | ||||
-rw-r--r-- | cmake.deps/cmake/BuildLuajit.cmake | 55 | ||||
-rw-r--r-- | cmake.deps/cmake/BuildLuv.cmake | 15 | ||||
-rw-r--r-- | cmake.deps/cmake/BuildMsgpack.cmake | 4 | ||||
-rw-r--r-- | cmake.deps/cmake/BuildTreesitter.cmake | 4 | ||||
-rw-r--r-- | cmake.deps/cmake/BuildTreesitterParsers.cmake | 10 | ||||
-rw-r--r-- | cmake.deps/cmake/BuildUnibilium.cmake | 4 | ||||
-rw-r--r-- | cmake.deps/cmake/GetBinaryDeps.cmake | 4 | ||||
-rw-r--r-- | cmake.deps/cmake/GettextCMakeLists.txt | 5 | ||||
-rw-r--r-- | cmake.deps/cmake/LibiconvCMakeLists.txt | 4 | ||||
-rw-r--r-- | cmake.deps/cmake/LibvtermCMakeLists.txt | 57 | ||||
-rw-r--r-- | cmake.deps/cmake/MarkdownParserCMakeLists.txt | 4 | ||||
-rw-r--r-- | cmake.deps/cmake/TreesitterCMakeLists.txt | 4 | ||||
-rw-r--r-- | cmake.deps/cmake/TreesitterParserCMakeLists.txt | 4 |
19 files changed, 24 insertions, 173 deletions
diff --git a/cmake.deps/cmake/BuildGettext.cmake b/cmake.deps/cmake/BuildGettext.cmake index 33cfbe1a22..29127dc811 100644 --- a/cmake.deps/cmake/BuildGettext.cmake +++ b/cmake.deps/cmake/BuildGettext.cmake @@ -1,7 +1,6 @@ if(MSVC) + get_externalproject_options(gettext ${DEPS_IGNORE_SHA}) ExternalProject_Add(gettext - URL ${GETTEXT_URL} - URL_HASH SHA256=${GETTEXT_SHA256} DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/gettext PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/cmake/GettextCMakeLists.txt @@ -9,7 +8,6 @@ if(MSVC) CMAKE_ARGS ${DEPS_CMAKE_ARGS} -D LIBICONV_INCLUDE_DIRS=${DEPS_INSTALL_DIR}/include -D LIBICONV_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} - CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS} ${EXTERNALPROJECT_OPTIONS}) else() message(FATAL_ERROR "Trying to build gettext in an unsupported system ${CMAKE_SYSTEM_NAME}/${CMAKE_C_COMPILER_ID}") diff --git a/cmake.deps/cmake/BuildLibiconv.cmake b/cmake.deps/cmake/BuildLibiconv.cmake index 362e9b4609..13126dc916 100644 --- a/cmake.deps/cmake/BuildLibiconv.cmake +++ b/cmake.deps/cmake/BuildLibiconv.cmake @@ -1,13 +1,11 @@ if(MSVC) + get_externalproject_options(libiconv ${DEPS_IGNORE_SHA}) ExternalProject_Add(libiconv - URL ${LIBICONV_URL} - URL_HASH SHA256=${LIBICONV_SHA256} DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/libiconv PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/cmake/LibiconvCMakeLists.txt ${DEPS_BUILD_DIR}/src/libiconv/CMakeLists.txt CMAKE_ARGS ${DEPS_CMAKE_ARGS} - CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS} ${EXTERNALPROJECT_OPTIONS}) else() message(FATAL_ERROR "Trying to build libiconv in an unsupported system ${CMAKE_SYSTEM_NAME}/${CMAKE_C_COMPILER_ID}") diff --git a/cmake.deps/cmake/BuildLibuv.cmake b/cmake.deps/cmake/BuildLibuv.cmake index e7f7fdf253..6f241f63f6 100644 --- a/cmake.deps/cmake/BuildLibuv.cmake +++ b/cmake.deps/cmake/BuildLibuv.cmake @@ -1,11 +1,9 @@ +get_externalproject_options(libuv ${DEPS_IGNORE_SHA}) ExternalProject_Add(libuv - URL ${LIBUV_URL} - URL_HASH SHA256=${LIBUV_SHA256} DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/libuv CMAKE_ARGS ${DEPS_CMAKE_ARGS} -D CMAKE_INSTALL_LIBDIR=lib -D BUILD_TESTING=OFF -D LIBUV_BUILD_SHARED=OFF -D UV_LINT_W4=OFF - CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS} ${EXTERNALPROJECT_OPTIONS}) diff --git a/cmake.deps/cmake/BuildLibvterm.cmake b/cmake.deps/cmake/BuildLibvterm.cmake index 63f5872cb2..3415d8debe 100644 --- a/cmake.deps/cmake/BuildLibvterm.cmake +++ b/cmake.deps/cmake/BuildLibvterm.cmake @@ -1,10 +1,8 @@ +get_externalproject_options(libvterm ${DEPS_IGNORE_SHA}) ExternalProject_Add(libvterm - URL ${LIBVTERM_URL} - URL_HASH SHA256=${LIBVTERM_SHA256} DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/libvterm PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/cmake/LibvtermCMakeLists.txt ${DEPS_BUILD_DIR}/src/libvterm/CMakeLists.txt CMAKE_ARGS ${DEPS_CMAKE_ARGS} - CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS} ${EXTERNALPROJECT_OPTIONS}) diff --git a/cmake.deps/cmake/BuildLpeg.cmake b/cmake.deps/cmake/BuildLpeg.cmake index b65baf4c0f..2dd9d62968 100644 --- a/cmake.deps/cmake/BuildLpeg.cmake +++ b/cmake.deps/cmake/BuildLpeg.cmake @@ -1,12 +1,10 @@ +get_externalproject_options(lpeg ${DEPS_IGNORE_SHA}) ExternalProject_Add(lpeg - URL ${LPEG_URL} - URL_HASH SHA256=${LPEG_SHA256} DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/lpeg PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/cmake/LpegCMakeLists.txt ${DEPS_BUILD_DIR}/src/lpeg/CMakeLists.txt CMAKE_ARGS ${DEPS_CMAKE_ARGS} -DCMAKE_C_FLAGS=${DEPS_INCLUDE_FLAGS} - CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS} ${EXTERNALPROJECT_OPTIONS}) if(USE_BUNDLED_LUAJIT) diff --git a/cmake.deps/cmake/BuildLua.cmake b/cmake.deps/cmake/BuildLua.cmake index 96b7a903f9..9a9f90db31 100644 --- a/cmake.deps/cmake/BuildLua.cmake +++ b/cmake.deps/cmake/BuildLua.cmake @@ -40,9 +40,8 @@ set(LUA_CONFIGURE_COMMAND -i ${DEPS_BUILD_DIR}/src/lua/src/luaconf.h) set(LUA_INSTALL_TOP_ARG "INSTALL_TOP=${DEPS_INSTALL_DIR}") +get_externalproject_options(lua ${DEPS_IGNORE_SHA}) ExternalProject_Add(lua - URL ${LUA_URL} - URL_HASH SHA256=${LUA_SHA256} DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/lua CONFIGURE_COMMAND "${LUA_CONFIGURE_COMMAND}" BUILD_IN_SOURCE 1 diff --git a/cmake.deps/cmake/BuildLuajit.cmake b/cmake.deps/cmake/BuildLuajit.cmake index 81fa6446c4..db37d79099 100644 --- a/cmake.deps/cmake/BuildLuajit.cmake +++ b/cmake.deps/cmake/BuildLuajit.cmake @@ -1,20 +1,13 @@ -# BuildLuajit(TARGET targetname CONFIGURE_COMMAND ... BUILD_COMMAND ... INSTALL_COMMAND ...) -# Reusable function to build luajit, wraps ExternalProject_Add. -# Failing to pass a command argument will result in no command being run function(BuildLuajit) cmake_parse_arguments(_luajit "" - "TARGET" + "" "CONFIGURE_COMMAND;BUILD_COMMAND;INSTALL_COMMAND;DEPENDS" ${ARGN}) - if(NOT _luajit_TARGET) - set(_luajit_TARGET "luajit") - endif() - ExternalProject_Add(${_luajit_TARGET} - URL ${LUAJIT_URL} - URL_HASH SHA256=${LUAJIT_SHA256} - DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/${_luajit_TARGET} + get_externalproject_options(luajit ${DEPS_IGNORE_SHA}) + ExternalProject_Add(luajit + DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/luajit CONFIGURE_COMMAND "${_luajit_CONFIGURE_COMMAND}" BUILD_IN_SOURCE 1 BUILD_COMMAND "${_luajit_BUILD_COMMAND}" @@ -48,49 +41,11 @@ if(APPLE) set(DEPLOYMENT_TARGET "MACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}") endif() -if((UNIX AND NOT APPLE) OR (APPLE AND NOT CMAKE_OSX_ARCHITECTURES)) +if(UNIX) BuildLuaJit(INSTALL_COMMAND ${BUILDCMD_UNIX} CC=${DEPS_C_COMPILER} PREFIX=${DEPS_INSTALL_DIR} ${DEPLOYMENT_TARGET} install) -elseif(CMAKE_OSX_ARCHITECTURES AND APPLE) - - set(LUAJIT_C_COMPILER "${CMAKE_C_COMPILER}") - if(CMAKE_OSX_SYSROOT) - set(LUAJIT_C_COMPILER "${LUAJIT_C_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}") - endif() - - # Passing multiple `-arch` flags to the LuaJIT build will cause it to fail. - # To get a working universal build, we build each requested architecture slice - # individually then `lipo` them all up. - set(LUAJIT_SRC_DIR "${DEPS_BUILD_DIR}/src/luajit") - foreach(ARCH IN LISTS CMAKE_OSX_ARCHITECTURES) - set(STATIC_CC "${LUAJIT_C_COMPILER} -arch ${ARCH}") - set(DYNAMIC_CC "${LUAJIT_C_COMPILER} -arch ${ARCH} -fPIC") - set(TARGET_LD "${LUAJIT_C_COMPILER} -arch ${ARCH}") - list(APPEND LUAJIT_THIN_EXECUTABLES "${LUAJIT_SRC_DIR}-${ARCH}/src/luajit") - list(APPEND LUAJIT_THIN_STATIC_LIBS "${LUAJIT_SRC_DIR}-${ARCH}/src/libluajit.a") - list(APPEND LUAJIT_THIN_DYLIBS "${LUAJIT_SRC_DIR}-${ARCH}/src/libluajit.so") - list(APPEND LUAJIT_THIN_TARGETS "luajit-${ARCH}") - - # See https://luajit.org/install.html#cross. - BuildLuaJit(TARGET "luajit-${ARCH}" - BUILD_COMMAND ${BUILDCMD_UNIX} - CC=${LUAJIT_C_COMPILER} STATIC_CC=${STATIC_CC} - DYNAMIC_CC=${DYNAMIC_CC} TARGET_LD=${TARGET_LD} - PREFIX=${DEPS_INSTALL_DIR} - ${DEPLOYMENT_TARGET}) - endforeach() - BuildLuaJit( - CONFIGURE_COMMAND ${BUILDCMD_UNIX} CC=${LUAJIT_C_COMPILER} PREFIX=${DEPS_INSTALL_DIR} ${DEPLOYMENT_TARGET} - COMMAND ${CMAKE_COMMAND} -E rm -f ${LUAJIT_SRC_DIR}/src/luajit ${LUAJIT_SRC_DIR}/src/libluajit.so ${LUAJIT_SRC_DIR}/src/libluajit.a - BUILD_COMMAND lipo ${LUAJIT_THIN_EXECUTABLES} -create -output ${LUAJIT_SRC_DIR}/src/luajit - COMMAND lipo ${LUAJIT_THIN_STATIC_LIBS} -create -output ${LUAJIT_SRC_DIR}/src/libluajit.a - COMMAND lipo ${LUAJIT_THIN_DYLIBS} -create -output ${LUAJIT_SRC_DIR}/src/libluajit.so - INSTALL_COMMAND ${BUILDCMD_UNIX} CC=${LUAJIT_C_COMPILER} PREFIX=${DEPS_INSTALL_DIR} ${DEPLOYMENT_TARGET} install - DEPENDS ${LUAJIT_THIN_TARGETS} - ) - elseif(MINGW) if(CMAKE_GENERATOR MATCHES "Ninja") diff --git a/cmake.deps/cmake/BuildLuv.cmake b/cmake.deps/cmake/BuildLuv.cmake index 9830ea717a..2e07f9e337 100644 --- a/cmake.deps/cmake/BuildLuv.cmake +++ b/cmake.deps/cmake/BuildLuv.cmake @@ -1,6 +1,6 @@ set(LUV_CMAKE_ARGS -D LUA_BUILD_TYPE=System - -D LUA_COMPAT53_DIR=${DEPS_BUILD_DIR}/src/lua-compat-5.3 + -D LUA_COMPAT53_DIR=${DEPS_BUILD_DIR}/src/lua_compat53 -D WITH_SHARED_LIBUV=ON -D BUILD_STATIC_LIBS=ON -D BUILD_MODULE=OFF) @@ -17,23 +17,20 @@ if(CMAKE_GENERATOR MATCHES "Unix Makefiles" AND list(APPEND LUV_CMAKE_ARGS -D CMAKE_MAKE_PROGRAM=gmake) endif() -ExternalProject_Add(lua-compat-5.3 - URL ${LUA_COMPAT53_URL} - URL_HASH SHA256=${LUA_COMPAT53_SHA256} - DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/lua-compat-5.3 +get_externalproject_options(lua_compat53 ${DEPS_IGNORE_SHA}) +ExternalProject_Add(lua_compat53 + DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/lua_compat53 CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" ${EXTERNALPROJECT_OPTIONS}) +get_externalproject_options(luv ${DEPS_IGNORE_SHA}) ExternalProject_Add(luv - DEPENDS lua-compat-5.3 - URL ${LUV_URL} - URL_HASH SHA256=${LUV_SHA256} + DEPENDS lua_compat53 DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/luv SOURCE_DIR ${DEPS_BUILD_DIR}/src/luv CMAKE_ARGS ${DEPS_CMAKE_ARGS} ${LUV_CMAKE_ARGS} - CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS} ${EXTERNALPROJECT_OPTIONS}) if(USE_BUNDLED_LUAJIT) diff --git a/cmake.deps/cmake/BuildMsgpack.cmake b/cmake.deps/cmake/BuildMsgpack.cmake index f60bdad5c9..8f82dab140 100644 --- a/cmake.deps/cmake/BuildMsgpack.cmake +++ b/cmake.deps/cmake/BuildMsgpack.cmake @@ -1,9 +1,7 @@ +get_externalproject_options(msgpack ${DEPS_IGNORE_SHA}) ExternalProject_Add(msgpack - URL ${MSGPACK_URL} - URL_HASH SHA256=${MSGPACK_SHA256} DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/msgpack CMAKE_ARGS ${DEPS_CMAKE_ARGS} -D MSGPACK_BUILD_TESTS=OFF -D MSGPACK_BUILD_EXAMPLES=OFF - CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS} ${EXTERNALPROJECT_OPTIONS}) diff --git a/cmake.deps/cmake/BuildTreesitter.cmake b/cmake.deps/cmake/BuildTreesitter.cmake index cd27a13ee3..7eb98163b9 100644 --- a/cmake.deps/cmake/BuildTreesitter.cmake +++ b/cmake.deps/cmake/BuildTreesitter.cmake @@ -1,10 +1,8 @@ +get_externalproject_options(treesitter ${DEPS_IGNORE_SHA}) ExternalProject_Add(treesitter - URL ${TREESITTER_URL} - URL_HASH SHA256=${TREESITTER_SHA256} DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/treesitter PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/cmake/TreesitterCMakeLists.txt ${DEPS_BUILD_DIR}/src/treesitter/CMakeLists.txt CMAKE_ARGS ${DEPS_CMAKE_ARGS} - CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS} ${EXTERNALPROJECT_OPTIONS}) diff --git a/cmake.deps/cmake/BuildTreesitterParsers.cmake b/cmake.deps/cmake/BuildTreesitterParsers.cmake index eddc896e69..837d075d20 100644 --- a/cmake.deps/cmake/BuildTreesitterParsers.cmake +++ b/cmake.deps/cmake/BuildTreesitterParsers.cmake @@ -15,22 +15,16 @@ function(BuildTSParser) set(TS_CMAKE_FILE TreesitterParserCMakeLists.txt) endif() - set(NAME treesitter-${TS_LANG}) - string(TOUPPER "TREESITTER_${TS_LANG}_URL" URL_VARNAME) - set(URL ${${URL_VARNAME}}) - string(TOUPPER "TREESITTER_${TS_LANG}_SHA256" HASH_VARNAME) - set(HASH ${${HASH_VARNAME}}) + set(NAME treesitter_${TS_LANG}) + get_externalproject_options(${NAME} ${DEPS_IGNORE_SHA}) ExternalProject_Add(${NAME} - URL ${URL} - URL_HASH SHA256=${HASH} DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/${NAME} PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${TS_CMAKE_FILE} ${DEPS_BUILD_DIR}/src/${NAME}/CMakeLists.txt CMAKE_ARGS ${DEPS_CMAKE_ARGS} -D PARSERLANG=${TS_LANG} - CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS} ${EXTERNALPROJECT_OPTIONS}) endfunction() diff --git a/cmake.deps/cmake/BuildUnibilium.cmake b/cmake.deps/cmake/BuildUnibilium.cmake index 9f1871aaf5..7ce4b5fbf2 100644 --- a/cmake.deps/cmake/BuildUnibilium.cmake +++ b/cmake.deps/cmake/BuildUnibilium.cmake @@ -1,7 +1,5 @@ +get_externalproject_options(unibilium ${DEPS_IGNORE_SHA}) ExternalProject_Add(unibilium - URL ${UNIBILIUM_URL} - URL_HASH SHA256=${UNIBILIUM_SHA256} DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/unibilium CMAKE_ARGS ${DEPS_CMAKE_ARGS} - CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS} ${EXTERNALPROJECT_OPTIONS}) diff --git a/cmake.deps/cmake/GetBinaryDeps.cmake b/cmake.deps/cmake/GetBinaryDeps.cmake index 2f1e237588..6d3ce48e4f 100644 --- a/cmake.deps/cmake/GetBinaryDeps.cmake +++ b/cmake.deps/cmake/GetBinaryDeps.cmake @@ -24,7 +24,7 @@ function(GetBinaryDep) BUILD_COMMAND "" INSTALL_COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_BIN_DIR} COMMAND "${_gettool_INSTALL_COMMAND}" - ${EXTERNALPROJECT_OPTIONS}) + DOWNLOAD_NO_PROGRESS TRUE) endfunction() # Download executable and move it to DEPS_BIN_DIR @@ -49,5 +49,5 @@ function(GetExecutable) BUILD_COMMAND "" INSTALL_COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_BIN_DIR} COMMAND ${CMAKE_COMMAND} -E copy <DOWNLOADED_FILE> ${DEPS_BIN_DIR} - ${EXTERNALPROJECT_OPTIONS}) + DOWNLOAD_NO_PROGRESS TRUE) endfunction() diff --git a/cmake.deps/cmake/GettextCMakeLists.txt b/cmake.deps/cmake/GettextCMakeLists.txt index 16fce4485f..c36f3aada5 100644 --- a/cmake.deps/cmake/GettextCMakeLists.txt +++ b/cmake.deps/cmake/GettextCMakeLists.txt @@ -1,9 +1,4 @@ cmake_minimum_required(VERSION 3.13) - -# Can be removed once minimum version is at least 3.15 -if(POLICY CMP0092) - cmake_policy(SET CMP0092 NEW) -endif() project(gettext C) add_compile_options(-w) diff --git a/cmake.deps/cmake/LibiconvCMakeLists.txt b/cmake.deps/cmake/LibiconvCMakeLists.txt index 220e3e07cb..e62b479b6b 100644 --- a/cmake.deps/cmake/LibiconvCMakeLists.txt +++ b/cmake.deps/cmake/LibiconvCMakeLists.txt @@ -1,8 +1,4 @@ cmake_minimum_required(VERSION 3.13) -# Can be removed once minimum version is at least 3.15 -if(POLICY CMP0092) - cmake_policy(SET CMP0092 NEW) -endif() project(libiconv C) add_compile_options(-w) diff --git a/cmake.deps/cmake/LibvtermCMakeLists.txt b/cmake.deps/cmake/LibvtermCMakeLists.txt index 41c79a915f..c197523786 100644 --- a/cmake.deps/cmake/LibvtermCMakeLists.txt +++ b/cmake.deps/cmake/LibvtermCMakeLists.txt @@ -1,67 +1,10 @@ cmake_minimum_required(VERSION 3.13) -# Can be removed once minimum version is at least 3.15 -if(POLICY CMP0092) - cmake_policy(SET CMP0092 NEW) -endif() project(libvterm C) add_compile_options(-w) include(GNUInstallDirs) -set(DECDRAWING [[ - static const struct StaticTableEncoding encoding_DECdrawing = { - { .decode = &decode_table }, - { - [0x60] = 0x25C6, - [0x61] = 0x2592, - [0x62] = 0x2409, - [0x63] = 0x240C, - [0x64] = 0x240D, - [0x65] = 0x240A, - [0x66] = 0x00B0, - [0x67] = 0x00B1, - [0x68] = 0x2424, - [0x69] = 0x240B, - [0x6a] = 0x2518, - [0x6b] = 0x2510, - [0x6c] = 0x250C, - [0x6d] = 0x2514, - [0x6e] = 0x253C, - [0x6f] = 0x23BA, - [0x70] = 0x23BB, - [0x71] = 0x2500, - [0x72] = 0x23BC, - [0x73] = 0x23BD, - [0x74] = 0x251C, - [0x75] = 0x2524, - [0x76] = 0x2534, - [0x77] = 0x252C, - [0x78] = 0x2502, - [0x79] = 0x2A7D, - [0x7a] = 0x2A7E, - [0x7b] = 0x03C0, - [0x7c] = 0x2260, - [0x7d] = 0x00A3, - [0x7e] = 0x00B7, - } - }; -]] -) - -set(UK [[ - static const struct StaticTableEncoding encoding_uk = { - { .decode = &decode_table }, - { - [0x23] = 0x00a3, - } - }; -]] -) - -file(WRITE src/encoding/DECdrawing.inc "${DECDRAWING}") -file(WRITE src/encoding/uk.inc "${UK}") - include_directories(${CMAKE_SOURCE_DIR}/include) include_directories(${CMAKE_BINARY_DIR}) diff --git a/cmake.deps/cmake/MarkdownParserCMakeLists.txt b/cmake.deps/cmake/MarkdownParserCMakeLists.txt index 8ee149e774..981bf4dfd7 100644 --- a/cmake.deps/cmake/MarkdownParserCMakeLists.txt +++ b/cmake.deps/cmake/MarkdownParserCMakeLists.txt @@ -1,8 +1,4 @@ cmake_minimum_required(VERSION 3.13) -# Can be removed once minimum version is at least 3.15 -if(POLICY CMP0092) - cmake_policy(SET CMP0092 NEW) -endif() project(${PARSERLANG} C) add_compile_options(-w) diff --git a/cmake.deps/cmake/TreesitterCMakeLists.txt b/cmake.deps/cmake/TreesitterCMakeLists.txt index f1e0d4e575..71174bfe5b 100644 --- a/cmake.deps/cmake/TreesitterCMakeLists.txt +++ b/cmake.deps/cmake/TreesitterCMakeLists.txt @@ -1,8 +1,4 @@ cmake_minimum_required(VERSION 3.13) -# Can be removed once minimum version is at least 3.15 -if(POLICY CMP0092) - cmake_policy(SET CMP0092 NEW) -endif() project(treesitter C) add_compile_options(-w) diff --git a/cmake.deps/cmake/TreesitterParserCMakeLists.txt b/cmake.deps/cmake/TreesitterParserCMakeLists.txt index c71a0a8f9b..0d4bbf0508 100644 --- a/cmake.deps/cmake/TreesitterParserCMakeLists.txt +++ b/cmake.deps/cmake/TreesitterParserCMakeLists.txt @@ -1,8 +1,4 @@ cmake_minimum_required(VERSION 3.13) -# Can be removed once minimum version is at least 3.15 -if(POLICY CMP0092) - cmake_policy(SET CMP0092 NEW) -endif() project(parser C) add_compile_options(-w) |