From b0bc03335d7fdeeedf09d0beafeeef329d897237 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 22 Sep 2023 10:42:11 -0400 Subject: [PATCH] build: Remove redundant flags in CMakeLists.txt They're already defined in CMakePresets.json --- CMakeLists.txt | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 688ed37b6..29af2ae0f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,35 +18,8 @@ include_directories (BEFORE SYSTEM ${SPARK_INCLUDE} ${EXTERNALS_ROOT}/include/zl link_directories (${SPARK_LIB}) if (WIN32) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \ - /MP \ - /WX /wd4251 /wd4250 /wd4251 /wd4244 /wd4267 /wd4355 /wd4275 /wd4345 \ - /bigobj \ - /DCURL_STATICLIB \ - /D_WINSOCK_DEPRECATED_NO_WARNINGS \ - /D__TBB_NO_IMPLICIT_LINKAGE \ - /DBOOST_ALL_NO_LIB \ - /std:c++17 \ - /D_SCL_SECURE_NO_WARNINGS /D_CRT_SECURE_NO_WARNINGS /D_WIN32_WINNT=0x0600") - - set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd") - set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} /MT") - set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF /LTCG") add_subdirectory(src/lib) else () - set(CMAKE_CXX_STANDARD 17) -# so that sparkd looks for libspark.so in its directory - set (CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) - set (CMAKE_INSTALL_RPATH ".") - set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/install/${CMAKE_BUILD_TYPE}/sparkd") - - set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} \ - -fPIC -Wall -pedantic -Wextra -Werror \ - -Wno-missing-braces -Wno-ignored-qualifiers -Wno-deprecated-copy -Wno-catch-value -Wno-class-memaccess \ - --std=c++17 -fdiagnostics-color") - set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -DNDEBUG -O3") - set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG") - set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wno-undef") # so that sparkd looks for libspark.so in its directory add_subdirectory(src/server/sparkd) add_subdirectory(src/lib)