Skip to content

Commit 8cd5c4e

Browse files
ariscoptkreuzer
authored andcommitted
CORE-14513 [CMAKE] Remove modules that are shipped with cmake (reactos#575)
* Remove unused cmake modules - Both are unedited versions of modules provided by cmake itself * Remove Compiler/GNU.cmake - Only chang was various _INIT flags, which are handled via CMAKE_USER_MAKE_RULES_OVERRIDE instead * Remove Platform/Windows.cmake - There's no clear explination for this file being in reactos and is simply an old version of the one in cmake * Remove Platform/Windows-MSVC.cmake - _INIT variable changes moved to overrides-msvc.cmake Remove /implib from link commands * Remove CMakeDetermineASMCompiler.cmake - Only change from 3.2 is the addition of a compiler list for the generic ASM dialect, but toolchain files explicitly set a compiler so the list is never used
1 parent 2eb7ddd commit 8cd5c4e

12 files changed

+35
-1187
lines changed

CMakeLists.txt

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ endif()
99
# Don't escape preprocessor definition values added via add_definitions
1010
cmake_policy(SET CMP0005 OLD)
1111

12-
# Shadow cmake provided modules
13-
cmake_policy(SET CMP0017 OLD)
14-
1512
# Honor CMAKE_SHARED_LIBRARY_<Lang>_FLAGS variable.
1613
cmake_policy(SET CMP0018 OLD)
1714

@@ -68,12 +65,6 @@ if(MSVC_IDE)
6865
add_compile_flags("/MP")
6966
endif()
7067
71-
# We don't need CMake importlib handling.
72-
# FIXME: Remove the MSVC_IDE condition when the upcoming RosBE lands.
73-
if(NOT MSVC_IDE)
74-
unset(CMAKE_IMPORT_LIBRARY_SUFFIX)
75-
endif()
76-
7768
# Bison and Flex support
7869
# include(sdk/cmake/bison-flex.cmake)
7970
@@ -115,6 +106,11 @@ if(NOT CMAKE_CROSSCOMPILING)
115106
endif()
116107
117108
else()
109+
# We don't need CMake importlib handling.
110+
# FIXME: Remove the MSVC_IDE condition when the upcoming RosBE lands.
111+
if(NOT MSVC_IDE)
112+
unset(CMAKE_IMPORT_LIBRARY_SUFFIX)
113+
endif()
118114
119115
if(NEW_STYLE_BUILD)
120116
include(sdk/cmake/host-tools.cmake)

overrides-gcc.cmake

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
foreach(lang C CXX ASM)
2+
set(CMAKE_${lang}_FLAGS_DEBUG "")
3+
set(CMAKE_${lang}_FLAGS_MINSIZEREL "-Os -DNDEBUG")
4+
set(CMAKE_${lang}_FLAGS_RELEASE "")
5+
set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG")
6+
endforeach()

overrides-msvc.cmake

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
set(CMAKE_CXX_FLAGS_DEBUG_INIT "")
2+
set(CMAKE_CXX_FLAGS_INIT "")
3+
set(CMAKE_CXX_FLAGS_RELEASE_INIT "")
4+
set(CMAKE_CXX_STANDARD_LIBRARIES_INIT "")
5+
set(CMAKE_C_FLAGS_DEBUG_INIT "")
6+
set(CMAKE_C_FLAGS_INIT "")
7+
set(CMAKE_C_FLAGS_RELEASE_INIT "")
8+
set(CMAKE_C_STANDARD_LIBRARIES_INIT "")
9+
set(CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug")
10+
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug")
11+
set(CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT "/debug")
12+
set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug")
13+
set(CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT "/debug")
14+
set(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug")

0 commit comments

Comments
 (0)