diff --git a/cmake.deps/cmake/BuildLuv.cmake b/cmake.deps/cmake/BuildLuv.cmake index 7220333de1..6b2d24f1f9 100644 --- a/cmake.deps/cmake/BuildLuv.cmake +++ b/cmake.deps/cmake/BuildLuv.cmake @@ -22,7 +22,7 @@ if(USE_BUNDLED_LIBUV) list(APPEND LUV_CMAKE_ARGS -D CMAKE_PREFIX_PATH=${DEPS_INSTALL_DIR}) endif() -list(APPEND LUV_CMAKE_ARGS "-DCMAKE_C_FLAGS:STRING=${DEPS_INCLUDE_FLAGS}") +list(APPEND LUV_CMAKE_ARGS "-DCMAKE_C_FLAGS:STRING=${DEPS_INCLUDE_FLAGS} -w") if(CMAKE_GENERATOR MATCHES "Unix Makefiles" AND (CMAKE_SYSTEM_NAME MATCHES ".*BSD" OR CMAKE_SYSTEM_NAME MATCHES "DragonFly")) list(APPEND LUV_CMAKE_ARGS -D CMAKE_MAKE_PROGRAM=gmake) diff --git a/cmake.deps/cmake/GettextCMakeLists.txt b/cmake.deps/cmake/GettextCMakeLists.txt index 26f060ec08..0c22efe4a6 100644 --- a/cmake.deps/cmake/GettextCMakeLists.txt +++ b/cmake.deps/cmake/GettextCMakeLists.txt @@ -73,8 +73,7 @@ set_property(TARGET libintl APPEND PROPERTY COMPILE_DEFINITIONS NO_XMALLOC set_relocation_prefix=libintl_set_relocation_prefix relocate=libintl_relocate - HAVE_CONFIG_H - _CRT_SECURE_NO_WARNINGS) + HAVE_CONFIG_H) file(READ gettext-tools/config.h.in CONFIG_CONTENT) diff --git a/cmake.deps/cmake/LibiconvCMakeLists.txt b/cmake.deps/cmake/LibiconvCMakeLists.txt index f6a23db864..c9af1a67e4 100644 --- a/cmake.deps/cmake/LibiconvCMakeLists.txt +++ b/cmake.deps/cmake/LibiconvCMakeLists.txt @@ -31,7 +31,7 @@ set(USE_MBSTATE_T 0) configure_file(libcharset/include/localcharset.h.build.in localcharset.h) configure_file(include/iconv.h.build.in iconv.h) -add_definitions(-DLIBDIR -D_CRT_SECURE_NO_WARNINGS) +add_definitions(-DLIBDIR) add_library(libcharset libcharset/lib/localcharset.c) diff --git a/cmake.deps/cmake/LibtermkeyCMakeLists.txt b/cmake.deps/cmake/LibtermkeyCMakeLists.txt index 87a56e4865..4b5a5a4ea8 100644 --- a/cmake.deps/cmake/LibtermkeyCMakeLists.txt +++ b/cmake.deps/cmake/LibtermkeyCMakeLists.txt @@ -16,7 +16,7 @@ endif() add_library(termkey termkey.c driver-csi.c driver-ti.c) -target_compile_definitions(termkey PRIVATE _CRT_SECURE_NO_WARNINGS HAVE_UNIBILIUM) +target_compile_definitions(termkey PRIVATE HAVE_UNIBILIUM) target_include_directories(termkey PRIVATE SYSTEM ${UNIBILIUM_INCLUDE_DIRS}) set_target_properties(termkey PROPERTIES diff --git a/cmake.deps/cmake/LibvtermCMakeLists.txt b/cmake.deps/cmake/LibvtermCMakeLists.txt index 0c31d32d64..f9b448b50d 100644 --- a/cmake.deps/cmake/LibvtermCMakeLists.txt +++ b/cmake.deps/cmake/LibvtermCMakeLists.txt @@ -3,10 +3,6 @@ project(libvterm C) include(GNUInstallDirs) -if(MSVC) - add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE) -endif() - set(DECDRAWING [[ static const struct StaticTableEncoding encoding_DECdrawing = { { .decode = &decode_table }, diff --git a/cmake.deps/cmake/LpegCMakeLists.txt b/cmake.deps/cmake/LpegCMakeLists.txt index 54cef7a9e4..ad2f062487 100644 --- a/cmake.deps/cmake/LpegCMakeLists.txt +++ b/cmake.deps/cmake/LpegCMakeLists.txt @@ -1,6 +1,8 @@ cmake_minimum_required(VERSION 3.10) project (lpeg C) +add_compile_options(-w) + include(GNUInstallDirs) file(GLOB LPEG_SOURCES ${CMAKE_SOURCE_DIR}/*.c) diff --git a/cmake/Deps.cmake b/cmake/Deps.cmake index e8dcbaa79d..6a7fd77aa8 100644 --- a/cmake/Deps.cmake +++ b/cmake/Deps.cmake @@ -18,6 +18,12 @@ if(APPLE) list(APPEND DEPS_CMAKE_ARGS -D CMAKE_FIND_FRAMEWORK=${CMAKE_FIND_FRAMEWORK}) endif() +if(MSVC) + list(APPEND DEPS_CMAKE_ARGS -D CMAKE_C_FLAGS="/w") +else() + list(APPEND DEPS_CMAKE_ARGS -D CMAKE_C_FLAGS="-w") +endif() + set(DEPS_CMAKE_CACHE_ARGS -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}) # MAKE_PRG