From cc438a5bbbbe368f2194f91157d8c9b40b666df2 Mon Sep 17 00:00:00 2001 From: MistEO Date: Mon, 16 Sep 2024 00:30:45 +0800 Subject: [PATCH] chore: remove DebWithRelDeps --- CMakeLists.txt | 1 - CMakePresets.json | 24 ------------------------ cmake/config.cmake | 10 +--------- 3 files changed, 1 insertion(+), 34 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c37a1108e..195a10092 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,6 @@ project(MaaFw) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules") set_property(GLOBAL PROPERTY USE_FOLDERS ON) -set(CMAKE_MAP_IMPORTED_CONFIG_DebWithRelDeps "DebWithRelDeps;Release;") set(Boost_NO_WARN_NEW_VERSIONS ON) diff --git a/CMakePresets.json b/CMakePresets.json index 2cb548180..e10d3549a 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -69,14 +69,6 @@ "configuration": "Debug", "jobs": 16 }, - { - "name": "NinjaMulti - DebWithRelDeps", - "displayName": "Ninja MultiConfig DebWithRelDeps", - "description": "Ninja MultiConfig DebWithRelDeps", - "configurePreset": "NinjaMulti", - "configuration": "RelWithDebInfo", - "jobs": 16 - }, { "name": "NinjaMulti - Release", "displayName": "Ninja MultiConfig Release", @@ -93,14 +85,6 @@ "configuration": "Debug", "jobs": 16 }, - { - "name": "NinjaMulti Win32 - DebWithRelDeps", - "displayName": "Ninja NinjaMulti Win32 DebWithRelDeps", - "description": "Ninja NinjaMulti Win32 DebWithRelDeps", - "configurePreset": "NinjaMulti Win32", - "configuration": "RelWithDebInfo", - "jobs": 16 - }, { "name": "NinjaMulti Win32 - Release", "displayName": "Ninja NinjaMulti Win32 Release", @@ -117,14 +101,6 @@ "configuration": "Debug", "jobs": 16 }, - { - "name": "MSVC 2022 - DebWithRelDeps", - "displayName": "MSVC 2022 DebWithRelDeps", - "description": "MSVC 2022 DebWithRelDeps", - "configurePreset": "MSVC 2022", - "configuration": "DebWithRelDeps", - "jobs": 16 - }, { "name": "MSVC 2022 - Release", "displayName": "MSVC 2022 Release", diff --git a/cmake/config.cmake b/cmake/config.cmake index 7c24955a2..318df1ce3 100644 --- a/cmake/config.cmake +++ b/cmake/config.cmake @@ -1,9 +1,6 @@ set(debug_comp_defs "_DEBUG;MAA_DEBUG") add_compile_definitions("$<$:${debug_comp_defs}>") -set(rel_debug_comp_defs "MAA_DEBUG") -add_compile_definitions("$<$:${rel_debug_comp_defs}>") - if(APPLE) set(CMAKE_INSTALL_RPATH "@loader_path;@executable_path") set(CMAKE_BUILD_RPATH "@loader_path;@executable_path") @@ -25,9 +22,6 @@ if(MSVC) # https://github.com/actions/runner-images/issues/10004 https://github.com/microsoft/STL/releases/tag/vs-2022-17.10 add_compile_definitions("_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR") - set(rel_debug_comp_options "/Od") - add_compile_options("$<$:${rel_debug_comp_options}>") - set(release_link_options "/OPT:REF;/OPT:ICF") add_link_options("$<$:${release_link_options}>") @@ -51,12 +45,10 @@ else() add_link_options("-L${DIR}") set(CMAKE_BUILD_RPATH "${CMAKE_BUILD_RPATH};${DIR};${DIR}/..") endif() + set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH};${DIR};${DIR}/..") endforeach() endif() - - set(rel_debug_comp_options "-O0") - add_compile_options("$<$:${rel_debug_comp_options}>") endif() set(CMAKE_CXX_STANDARD 20)