Skip to content

Commit 48f7e2d

Browse files
berenmberenm
committedJan 8, 2018
Unhardcode the CMAKE_CONFIGURATION_TYPES values
This removes duplicated code for per-config variable initialization by providing a `cmake_initialize_per_config_variable(<PREFIX> <DOCSTRING>)` function. This function initializes a `<PREFIX>` cache variable from `<PREFIX>_INIT` and unless the `CMAKE_NOT_USING_CONFIG_FLAGS` variable is defined, does the same with `<PREFIX>_<CONFIG>` from `<PREFIX>_<CONFIG>_INIT` for every `<CONFIG>` in `CMAKE_CONFIGURATION_TYPES` for multi-config generators or `CMAKE_BUILD_TYPE` for single-config generators.
·
v4.0.0v3.11.0-rc1
1 parent f7f34a4 commit 48f7e2d

32 files changed

+113
-410
lines changed
 

‎Help/manual/cmake-variables.7.rst

+3
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,8 @@ Variables for Languages
414414
/variable/CMAKE_LANG_CREATE_SHARED_MODULE
415415
/variable/CMAKE_LANG_CREATE_STATIC_LIBRARY
416416
/variable/CMAKE_LANG_FLAGS
417+
/variable/CMAKE_LANG_FLAGS_CONFIG
418+
/variable/CMAKE_LANG_FLAGS_CONFIG_INIT
417419
/variable/CMAKE_LANG_FLAGS_DEBUG
418420
/variable/CMAKE_LANG_FLAGS_DEBUG_INIT
419421
/variable/CMAKE_LANG_FLAGS_INIT
@@ -423,6 +425,7 @@ Variables for Languages
423425
/variable/CMAKE_LANG_FLAGS_RELEASE_INIT
424426
/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO
425427
/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO_INIT
428+
/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_CONFIG
426429
/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_DEBUG
427430
/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_MINSIZEREL
428431
/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_RELEASE

‎Help/prop_tgt/LINK_FLAGS.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ Additional flags to use when linking this target.
55

66
The LINK_FLAGS property can be used to add extra flags to the link
77
step of a target. LINK_FLAGS_<CONFIG> will add to the configuration
8-
<CONFIG>, for example, DEBUG, RELEASE, MINSIZEREL, RELWITHDEBINFO.
8+
<CONFIG>, for example, DEBUG, RELEASE, MINSIZEREL, RELWITHDEBINFO, ...

‎Help/variable/CMAKE_BUILD_TYPE.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ Specifies the build type on single-configuration generators.
55

66
This statically specifies what build type (configuration) will be
77
built in this build tree. Possible values are empty, ``Debug``, ``Release``,
8-
``RelWithDebInfo`` and ``MinSizeRel``. This variable is only meaningful to
8+
``RelWithDebInfo``, ``MinSizeRel``, ... This variable is only meaningful to
99
single-configuration generators (such as :ref:`Makefile Generators` and
1010
:generator:`Ninja`) i.e. those which choose a single configuration when CMake
1111
runs to generate a build tree as opposed to multi-configuration generators
1212
which offer selection of the build configuration within the generated build
1313
environment. There are many per-config properties and variables
1414
(usually following clean ``SOME_VAR_<CONFIG>`` order conventions), such as
1515
``CMAKE_C_FLAGS_<CONFIG>``, specified as uppercase:
16-
``CMAKE_C_FLAGS_[DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL]``. For example,
16+
``CMAKE_C_FLAGS_[DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL|...]``. For example,
1717
in a build tree configured to build type ``Debug``, CMake will see to
1818
having :variable:`CMAKE_C_FLAGS_DEBUG <CMAKE_<LANG>_FLAGS_DEBUG>` settings get
1919
added to the :variable:`CMAKE_C_FLAGS <CMAKE_<LANG>_FLAGS>` settings. See

‎Help/variable/CMAKE_LANG_FLAGS_CONFIG.rst

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
CMAKE_<LANG>_FLAGS_<CONFIG>
2+
---------------------------
3+
4+
Flags for language ``<LANG>`` when building for the ``<CONFIG>`` configuration.

‎Help/variable/CMAKE_LANG_FLAGS_CONFIG_INIT.rst

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
CMAKE_<LANG>_FLAGS_<CONFIG>_INIT
2+
--------------------------------
3+
4+
Value used to initialize the :variable:`CMAKE_<LANG>_FLAGS_<CONFIG>` cache
5+
entry the first time a build tree is configured for language ``<LANG>``.
6+
This variable is meant to be set by a :variable:`toolchain file
7+
<CMAKE_TOOLCHAIN_FILE>`. CMake may prepend or append content to
8+
the value based on the environment and target platform.
9+
10+
See also :variable:`CMAKE_<LANG>_FLAGS_INIT`.

‎Help/variable/CMAKE_LANG_FLAGS_DEBUG.rst

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
CMAKE_<LANG>_FLAGS_DEBUG
22
------------------------
33

4-
Flags for ``Debug`` build type or configuration.
5-
6-
``<LANG>`` flags used when :variable:`CMAKE_BUILD_TYPE` is ``Debug``.
4+
This variable is the ``Debug`` variant of the
5+
:variable:`CMAKE_<LANG>_FLAGS_<CONFIG>` variable.

‎Help/variable/CMAKE_LANG_FLAGS_DEBUG_INIT.rst

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
CMAKE_<LANG>_FLAGS_DEBUG_INIT
22
-----------------------------
33

4-
Value used to initialize the :variable:`CMAKE_<LANG>_FLAGS_DEBUG` cache
5-
entry the first time a build tree is configured for language ``<LANG>``.
6-
This variable is meant to be set by a :variable:`toolchain file
7-
<CMAKE_TOOLCHAIN_FILE>`. CMake may prepend or append content to
8-
the value based on the environment and target platform.
9-
10-
See also :variable:`CMAKE_<LANG>_FLAGS_INIT`.
4+
This variable is the ``Debug`` variant of the
5+
:variable:`CMAKE_<LANG>_FLAGS_<CONFIG>_INIT` variable.

‎Help/variable/CMAKE_LANG_FLAGS_INIT.rst

+2-6
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,5 @@ This variable is meant to be set by a :variable:`toolchain file
77
<CMAKE_TOOLCHAIN_FILE>`. CMake may prepend or append content to
88
the value based on the environment and target platform.
99

10-
See also the configuration-specific variables:
11-
12-
* :variable:`CMAKE_<LANG>_FLAGS_DEBUG_INIT`
13-
* :variable:`CMAKE_<LANG>_FLAGS_RELEASE_INIT`
14-
* :variable:`CMAKE_<LANG>_FLAGS_MINSIZEREL_INIT`
15-
* :variable:`CMAKE_<LANG>_FLAGS_RELWITHDEBINFO_INIT`
10+
See also the configuration-specific
11+
:variable:`CMAKE_<LANG>_FLAGS_<CONFIG>_INIT` variable.

‎Help/variable/CMAKE_LANG_FLAGS_MINSIZEREL.rst

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
CMAKE_<LANG>_FLAGS_MINSIZEREL
22
-----------------------------
33

4-
Flags for ``MinSizeRel`` build type or configuration.
5-
6-
``<LANG>`` flags used when :variable:`CMAKE_BUILD_TYPE` is ``MinSizeRel``
7-
(short for minimum size release).
4+
This variable is the ``MinSizeRel`` variant of the
5+
:variable:`CMAKE_<LANG>_FLAGS_<CONFIG>` variable.

‎Help/variable/CMAKE_LANG_FLAGS_MINSIZEREL_INIT.rst

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
CMAKE_<LANG>_FLAGS_MINSIZEREL_INIT
22
----------------------------------
33

4-
Value used to initialize the :variable:`CMAKE_<LANG>_FLAGS_MINSIZEREL`
5-
cache entry the first time a build tree is configured for language ``<LANG>``.
6-
This variable is meant to be set by a :variable:`toolchain file
7-
<CMAKE_TOOLCHAIN_FILE>`. CMake may prepend or append content to
8-
the value based on the environment and target platform.
9-
10-
See also :variable:`CMAKE_<LANG>_FLAGS_INIT`.
4+
This variable is the ``MinSizeRel`` variant of the
5+
:variable:`CMAKE_<LANG>_FLAGS_<CONFIG>_INIT` variable.

‎Help/variable/CMAKE_LANG_FLAGS_RELEASE.rst

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
CMAKE_<LANG>_FLAGS_RELEASE
22
--------------------------
33

4-
Flags for ``Release`` build type or configuration.
5-
6-
``<LANG>`` flags used when :variable:`CMAKE_BUILD_TYPE` is ``Release``.
4+
This variable is the ``Release`` variant of the
5+
:variable:`CMAKE_<LANG>_FLAGS_<CONFIG>` variable.

‎Help/variable/CMAKE_LANG_FLAGS_RELEASE_INIT.rst

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
CMAKE_<LANG>_FLAGS_RELEASE_INIT
22
-------------------------------
33

4-
Value used to initialize the :variable:`CMAKE_<LANG>_FLAGS_RELEASE`
5-
cache entry the first time a build tree is configured for language ``<LANG>``.
6-
This variable is meant to be set by a :variable:`toolchain file
7-
<CMAKE_TOOLCHAIN_FILE>`. CMake may prepend or append content to
8-
the value based on the environment and target platform.
9-
10-
See also :variable:`CMAKE_<LANG>_FLAGS_INIT`.
4+
This variable is the ``Release`` variant of the
5+
:variable:`CMAKE_<LANG>_FLAGS_<CONFIG>_INIT` variable.

‎Help/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO.rst

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
CMAKE_<LANG>_FLAGS_RELWITHDEBINFO
22
---------------------------------
33

4-
Flags for ``RelWithDebInfo`` type or configuration.
5-
6-
``<LANG>`` flags used when :variable:`CMAKE_BUILD_TYPE` is ``RelWithDebInfo``
7-
(short for Release With Debug Information).
4+
This variable is the ``RelWithDebInfo`` variant of the
5+
:variable:`CMAKE_<LANG>_FLAGS_<CONFIG>` variable.

‎Help/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO_INIT.rst

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
CMAKE_<LANG>_FLAGS_RELWITHDEBINFO_INIT
22
--------------------------------------
33

4-
Value used to initialize the :variable:`CMAKE_<LANG>_FLAGS_RELWITHDEBINFO`
5-
cache entry the first time a build tree is configured for language ``<LANG>``.
6-
This variable is meant to be set by a :variable:`toolchain file
7-
<CMAKE_TOOLCHAIN_FILE>`. CMake may prepend or append content to
8-
the value based on the environment and target platform.
9-
10-
See also :variable:`CMAKE_<LANG>_FLAGS_INIT`.
4+
This variable is the ``RelWithDebInfo`` variant of the
5+
:variable:`CMAKE_<LANG>_FLAGS_<CONFIG>_INIT` variable.

‎Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_CONFIG.rst

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
CMAKE_<LANG>_GHS_KERNEL_FLAGS_<CONFIG>
2+
--------------------------------------
3+
4+
GHS kernel flags for language ``<LANG>`` when building for the ``<CONFIG>``
5+
configuration.

‎Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_DEBUG.rst

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
CMAKE_<LANG>_GHS_KERNEL_FLAGS_DEBUG
22
-----------------------------------
33

4-
GHS kernel flags for ``Debug`` build type or configuration.
5-
6-
``<LANG>`` flags used when :variable:`CMAKE_BUILD_TYPE` is ``Debug``.
4+
This variable is the ``Debug`` variant of the
5+
:variable:`CMAKE_<LANG>_GHS_KERNEL_FLAGS_<CONFIG>` variable.

‎Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_MINSIZEREL.rst

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
CMAKE_<LANG>_GHS_KERNEL_FLAGS_MINSIZEREL
22
----------------------------------------
33

4-
GHS kernel flags for ``MinSizeRel`` build type or configuration.
5-
6-
``<LANG>`` flags used when :variable:`CMAKE_BUILD_TYPE` is ``MinSizeRel``
7-
(short for minimum size release).
4+
This variable is the ``MinSizeRel`` variant of the
5+
:variable:`CMAKE_<LANG>_GHS_KERNEL_FLAGS_<CONFIG>` variable.

‎Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_RELEASE.rst

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
CMAKE_<LANG>_GHS_KERNEL_FLAGS_RELEASE
22
-------------------------------------
33

4-
GHS kernel flags for ``Release`` build type or configuration.
5-
6-
``<LANG>`` flags used when :variable:`CMAKE_BUILD_TYPE` is ``Release``.
4+
This variable is the ``Release`` variant of the
5+
:variable:`CMAKE_<LANG>_GHS_KERNEL_FLAGS_<CONFIG>` variable.

‎Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_RELWITHDEBINFO.rst

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
CMAKE_<LANG>_GHS_KERNEL_FLAGS_RELWITHDEBINFO
22
--------------------------------------------
33

4-
GHS kernel flags for ``RelWithDebInfo`` type or configuration.
5-
6-
``<LANG>`` flags used when :variable:`CMAKE_BUILD_TYPE` is ``RelWithDebInfo``
7-
(short for Release With Debug Information).
4+
This variable is the ``RelWithDebInfo`` variant of the
5+
:variable:`CMAKE_<LANG>_GHS_KERNEL_FLAGS_<CONFIG>` variable.

‎Modules/CMakeASMInformation.cmake

+1-32
Original file line numberDiff line numberDiff line change
@@ -67,38 +67,7 @@ endif()
6767
# Support for CMAKE_ASM${ASM_DIALECT}_FLAGS_INIT and friends:
6868
set(CMAKE_ASM${ASM_DIALECT}_FLAGS_INIT "$ENV{ASM${ASM_DIALECT}FLAGS} ${CMAKE_ASM${ASM_DIALECT}_FLAGS_INIT}")
6969

70-
foreach(c "" _DEBUG _RELEASE _MINSIZEREL _RELWITHDEBINFO)
71-
string(STRIP "${CMAKE_ASM${ASM_DIALECT}_FLAGS${c}_INIT}" CMAKE_ASM${ASM_DIALECT}_FLAGS${c}_INIT)
72-
endforeach()
73-
74-
set (CMAKE_ASM${ASM_DIALECT}_FLAGS "${CMAKE_ASM${ASM_DIALECT}_FLAGS_INIT}" CACHE STRING
75-
"Flags used by the assembler during all build types.")
76-
77-
if(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
78-
get_property(_GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
79-
# default build type is none
80-
if(NOT _GENERATOR_IS_MULTI_CONFIG AND NOT CMAKE_NO_BUILD_TYPE)
81-
set (CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE_INIT} CACHE STRING
82-
"Choose the type of build, options are: None, Debug Release RelWithDebInfo MinSizeRel.")
83-
endif()
84-
unset(_GENERATOR_IS_MULTI_CONFIG)
85-
set (CMAKE_ASM${ASM_DIALECT}_FLAGS_DEBUG "${CMAKE_ASM${ASM_DIALECT}_FLAGS_DEBUG_INIT}" CACHE STRING
86-
"Flags used by the assembler during debug builds.")
87-
set (CMAKE_ASM${ASM_DIALECT}_FLAGS_MINSIZEREL "${CMAKE_ASM${ASM_DIALECT}_FLAGS_MINSIZEREL_INIT}" CACHE STRING
88-
"Flags used by the assembler during release minsize builds.")
89-
set (CMAKE_ASM${ASM_DIALECT}_FLAGS_RELEASE "${CMAKE_ASM${ASM_DIALECT}_FLAGS_RELEASE_INIT}" CACHE STRING
90-
"Flags used by the assembler during release builds.")
91-
set (CMAKE_ASM${ASM_DIALECT}_FLAGS_RELWITHDEBINFO "${CMAKE_ASM${ASM_DIALECT}_FLAGS_RELWITHDEBINFO_INIT}" CACHE STRING
92-
"Flags used by the assembler during Release with Debug Info builds.")
93-
endif()
94-
95-
mark_as_advanced(CMAKE_ASM${ASM_DIALECT}_FLAGS
96-
CMAKE_ASM${ASM_DIALECT}_FLAGS_DEBUG
97-
CMAKE_ASM${ASM_DIALECT}_FLAGS_MINSIZEREL
98-
CMAKE_ASM${ASM_DIALECT}_FLAGS_RELEASE
99-
CMAKE_ASM${ASM_DIALECT}_FLAGS_RELWITHDEBINFO
100-
)
101-
70+
cmake_initialize_per_config_variable(CMAKE_ASM${ASM_DIALECT}_FLAGS "Flags used by the ASM${ASM_DIALECT} compiler")
10271

10372
if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT)
10473
set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "<CMAKE_ASM${ASM_DIALECT}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT> -c <SOURCE>")

‎Modules/CMakeCInformation.cmake

+1-31
Original file line numberDiff line numberDiff line change
@@ -102,30 +102,7 @@ endif()
102102

103103
set(CMAKE_C_FLAGS_INIT "$ENV{CFLAGS} ${CMAKE_C_FLAGS_INIT}")
104104

105-
foreach(c "" _DEBUG _RELEASE _MINSIZEREL _RELWITHDEBINFO)
106-
string(STRIP "${CMAKE_C_FLAGS${c}_INIT}" CMAKE_C_FLAGS${c}_INIT)
107-
endforeach()
108-
109-
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS_INIT}" CACHE STRING
110-
"Flags used by the compiler during all build types.")
111-
112-
if(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
113-
get_property(_GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
114-
# default build type is none
115-
if(NOT _GENERATOR_IS_MULTI_CONFIG AND NOT CMAKE_NO_BUILD_TYPE)
116-
set (CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE_INIT} CACHE STRING
117-
"Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.")
118-
endif()
119-
unset(_GENERATOR_IS_MULTI_CONFIG)
120-
set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG_INIT}" CACHE STRING
121-
"Flags used by the compiler during debug builds.")
122-
set (CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL_INIT}" CACHE STRING
123-
"Flags used by the compiler during release builds for minimum size.")
124-
set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE_INIT}" CACHE STRING
125-
"Flags used by the compiler during release builds.")
126-
set (CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO_INIT}" CACHE STRING
127-
"Flags used by the compiler during release builds with debug info.")
128-
endif()
105+
cmake_initialize_per_config_variable(CMAKE_C_FLAGS "Flags used by the C compiler")
129106

130107
if(CMAKE_C_STANDARD_LIBRARIES_INIT)
131108
set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES_INIT}"
@@ -208,13 +185,6 @@ if(NOT CMAKE_EXECUTABLE_RPATH_LINK_C_FLAG)
208185
set(CMAKE_EXECUTABLE_RPATH_LINK_C_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG})
209186
endif()
210187

211-
mark_as_advanced(
212-
CMAKE_C_FLAGS
213-
CMAKE_C_FLAGS_DEBUG
214-
CMAKE_C_FLAGS_MINSIZEREL
215-
CMAKE_C_FLAGS_RELEASE
216-
CMAKE_C_FLAGS_RELWITHDEBINFO
217-
)
218188
set(CMAKE_C_INFORMATION_LOADED 1)
219189

220190

‎Modules/CMakeCSharpInformation.cmake

+3-55
Original file line numberDiff line numberDiff line change
@@ -44,23 +44,8 @@ endif()
4444
# use _INIT variables so that this only happens the first time
4545
# and you can set these flags in the cmake cache
4646
set(CMAKE_CSharp_FLAGS_INIT "$ENV{CSFLAGS} ${CMAKE_CSharp_FLAGS_INIT}")
47-
# avoid just having a space as the initial value for the cache
48-
if(CMAKE_CSharp_FLAGS_INIT STREQUAL " ")
49-
set(CMAKE_CSharp_FLAGS_INIT)
50-
endif()
51-
set (CMAKE_CSharp_FLAGS "${CMAKE_CSharp_FLAGS_INIT}" CACHE STRING
52-
"Flags used by the C# compiler during all build types.")
5347

54-
if(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
55-
set (CMAKE_CSharp_FLAGS_DEBUG "${CMAKE_CSharp_FLAGS_DEBUG_INIT}" CACHE STRING
56-
"Flags used by the C# compiler during debug builds.")
57-
set (CMAKE_CSharp_FLAGS_MINSIZEREL "${CMAKE_CSharp_FLAGS_MINSIZEREL_INIT}" CACHE STRING
58-
"Flags used by the C# compiler during release builds for minimum size.")
59-
set (CMAKE_CSharp_FLAGS_RELEASE "${CMAKE_CSharp_FLAGS_RELEASE_INIT}" CACHE STRING
60-
"Flags used by the C# compiler during release builds.")
61-
set (CMAKE_CSharp_FLAGS_RELWITHDEBINFO "${CMAKE_CSharp_FLAGS_RELWITHDEBINFO_INIT}" CACHE STRING
62-
"Flags used by the C# compiler during release builds with debug info.")
63-
endif()
48+
cmake_initialize_per_config_variable(CMAKE_CSharp_FLAGS "Flags used by the C# compiler")
6449

6550
if(CMAKE_CSharp_STANDARD_LIBRARIES_INIT)
6651
set(CMAKE_CSharp_STANDARD_LIBRARIES "${CMAKE_CSharp_STANDARD_LIBRARIES_INIT}"
@@ -71,49 +56,12 @@ endif()
7156
# set missing flags (if they are not defined). This is needed in the
7257
# unlikely case that you have only C# and no C/C++ targets in your
7358
# project.
74-
if(NOT DEFINED CMAKE_SHARED_LINKER_FLAGS)
75-
set(CMAKE_SHARED_LINKER_FLAGS "" CACHE STRING "" FORCE)
76-
endif()
77-
if(NOT DEFINED CMAKE_SHARED_LINKER_FLAGS_DEBUG)
78-
set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "" CACHE STRING "" FORCE)
79-
endif()
80-
if(NOT DEFINED CMAKE_SHARED_LINKER_FLAGS_RELEASE)
81-
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "" CACHE STRING "" FORCE)
82-
endif()
83-
if(NOT DEFINED CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL)
84-
set(CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL "" CACHE STRING "" FORCE)
85-
endif()
86-
if(NOT DEFINED CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO)
87-
set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "" CACHE STRING "" FORCE)
88-
endif()
89-
90-
if(NOT DEFINED CMAKE_EXE_LINKER_FLAGS)
91-
set(CMAKE_EXE_LINKER_FLAGS "" CACHE STRING "" FORCE)
92-
endif()
93-
if(NOT DEFINED CMAKE_EXE_LINKER_FLAGS_DEBUG)
94-
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "" CACHE STRING "" FORCE)
95-
endif()
96-
if(NOT DEFINED CMAKE_EXE_LINKER_FLAGS_RELEASE)
97-
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "" CACHE STRING "" FORCE)
98-
endif()
99-
if(NOT DEFINED CMAKE_EXE_LINKER_FLAGS_MINSIZEREL)
100-
set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "" CACHE STRING "" FORCE)
101-
endif()
102-
if(NOT DEFINED CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO)
103-
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "" CACHE STRING "" FORCE)
104-
endif()
59+
cmake_initialize_per_config_variable(CMAKE_EXE_LINKER_FLAGS "Flags used by the linker")
60+
cmake_initialize_per_config_variable(CMAKE_SHARED_LINKER_FLAGS "Flags used by the linker during the creation of shared libraries")
10561

10662
set(CMAKE_CSharp_CREATE_SHARED_LIBRARY "CSharp_NO_CREATE_SHARED_LIBRARY")
10763
set(CMAKE_CSharp_CREATE_SHARED_MODULE "CSharp_NO_CREATE_SHARED_MODULE")
10864
set(CMAKE_CSharp_LINK_EXECUTABLE "CSharp_NO_LINK_EXECUTABLE")
10965

110-
mark_as_advanced(
111-
CMAKE_CSharp_FLAGS
112-
CMAKE_CSharp_FLAGS_RELEASE
113-
CMAKE_CSharp_FLAGS_RELWITHDEBINFO
114-
CMAKE_CSharp_FLAGS_MINSIZEREL
115-
CMAKE_CSharp_FLAGS_DEBUG
116-
)
117-
11866
set(CMAKE_CSharp_USE_RESPONSE_FILE_FOR_OBJECTS 1)
11967
set(CMAKE_CSharp_INFORMATION_LOADED 1)

‎Modules/CMakeCUDAInformation.cmake

+1-25
Original file line numberDiff line numberDiff line change
@@ -74,24 +74,7 @@ endif()
7474
# and you can set these flags in the cmake cache
7575
set(CMAKE_CUDA_FLAGS_INIT "$ENV{CUDAFLAGS} ${CMAKE_CUDA_FLAGS_INIT}")
7676

77-
foreach(c "" _DEBUG _RELEASE _MINSIZEREL _RELWITHDEBINFO)
78-
string(STRIP "${CMAKE_CUDA_FLAGS${c}_INIT}" CMAKE_CUDA_FLAGS${c}_INIT)
79-
endforeach()
80-
81-
set (CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS_INIT}" CACHE STRING
82-
"Flags used by the compiler during all build types.")
83-
84-
if(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
85-
set (CMAKE_CUDA_FLAGS_DEBUG "${CMAKE_CUDA_FLAGS_DEBUG_INIT}" CACHE STRING
86-
"Flags used by the compiler during debug builds.")
87-
set (CMAKE_CUDA_FLAGS_MINSIZEREL "${CMAKE_CUDA_FLAGS_MINSIZEREL_INIT}" CACHE STRING
88-
"Flags used by the compiler during release builds for minimum size.")
89-
set (CMAKE_CUDA_FLAGS_RELEASE "${CMAKE_CUDA_FLAGS_RELEASE_INIT}" CACHE STRING
90-
"Flags used by the compiler during release builds.")
91-
set (CMAKE_CUDA_FLAGS_RELWITHDEBINFO "${CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT}" CACHE STRING
92-
"Flags used by the compiler during release builds with debug info.")
93-
94-
endif()
77+
cmake_initialize_per_config_variable(CMAKE_CUDA_FLAGS "Flags used by the CUDA compiler")
9578

9679
if(CMAKE_CUDA_STANDARD_LIBRARIES_INIT)
9780
set(CMAKE_CUDA_STANDARD_LIBRARIES "${CMAKE_CUDA_STANDARD_LIBRARIES_INIT}"
@@ -207,11 +190,4 @@ endif()
207190

208191
unset(_CMAKE_CUDA_EXTRA_DEVICE_LINK_FLAGS)
209192

210-
mark_as_advanced(
211-
CMAKE_CUDA_FLAGS
212-
CMAKE_CUDA_FLAGS_RELEASE
213-
CMAKE_CUDA_FLAGS_RELWITHDEBINFO
214-
CMAKE_CUDA_FLAGS_MINSIZEREL
215-
CMAKE_CUDA_FLAGS_DEBUG)
216-
217193
set(CMAKE_CUDA_INFORMATION_LOADED 1)

‎Modules/CMakeCXXInformation.cmake

+2-23
Original file line numberDiff line numberDiff line change
@@ -197,24 +197,7 @@ endforeach()
197197
# and you can set these flags in the cmake cache
198198
set(CMAKE_CXX_FLAGS_INIT "$ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS_INIT}")
199199

200-
foreach(c "" _DEBUG _RELEASE _MINSIZEREL _RELWITHDEBINFO)
201-
string(STRIP "${CMAKE_CXX_FLAGS${c}_INIT}" CMAKE_CXX_FLAGS${c}_INIT)
202-
endforeach()
203-
204-
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_INIT}" CACHE STRING
205-
"Flags used by the compiler during all build types.")
206-
207-
if(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
208-
set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG_INIT}" CACHE STRING
209-
"Flags used by the compiler during debug builds.")
210-
set (CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL_INIT}" CACHE STRING
211-
"Flags used by the compiler during release builds for minimum size.")
212-
set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE_INIT}" CACHE STRING
213-
"Flags used by the compiler during release builds.")
214-
set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT}" CACHE STRING
215-
"Flags used by the compiler during release builds with debug info.")
216-
217-
endif()
200+
cmake_initialize_per_config_variable(CMAKE_CXX_FLAGS "Flags used by the CXX compiler")
218201

219202
if(CMAKE_CXX_STANDARD_LIBRARIES_INIT)
220203
set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES_INIT}"
@@ -287,11 +270,7 @@ endif()
287270

288271
mark_as_advanced(
289272
CMAKE_VERBOSE_MAKEFILE
290-
CMAKE_CXX_FLAGS
291-
CMAKE_CXX_FLAGS_RELEASE
292-
CMAKE_CXX_FLAGS_RELWITHDEBINFO
293-
CMAKE_CXX_FLAGS_MINSIZEREL
294-
CMAKE_CXX_FLAGS_DEBUG)
273+
)
295274

296275
set(CMAKE_CXX_INFORMATION_LOADED 1)
297276

‎Modules/CMakeCommonLanguageInclude.cmake

+4-110
Original file line numberDiff line numberDiff line change
@@ -10,120 +10,14 @@ string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " $ENV{LDFLAGS}")
1010
string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " $ENV{LDFLAGS}")
1111
string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT " $ENV{LDFLAGS}")
1212

13-
foreach(t EXE SHARED MODULE STATIC)
14-
foreach(c "" _DEBUG _RELEASE _MINSIZEREL _RELWITHDEBINFO)
15-
string(STRIP "${CMAKE_${t}_LINKER_FLAGS${c}_INIT}" CMAKE_${t}_LINKER_FLAGS${c}_INIT)
16-
endforeach()
17-
endforeach()
18-
19-
if(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
20-
get_property(_GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
21-
# default build type is none
22-
if(NOT _GENERATOR_IS_MULTI_CONFIG AND NOT CMAKE_NO_BUILD_TYPE)
23-
set (CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE_INIT} CACHE STRING
24-
"Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.")
25-
endif()
26-
unset(_GENERATOR_IS_MULTI_CONFIG)
27-
28-
set (CMAKE_EXE_LINKER_FLAGS_DEBUG ${CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT} CACHE STRING
29-
"Flags used by the linker during debug builds.")
30-
31-
set (CMAKE_EXE_LINKER_FLAGS_MINSIZEREL ${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT} CACHE STRING
32-
"Flags used by the linker during release minsize builds.")
33-
34-
set (CMAKE_EXE_LINKER_FLAGS_RELEASE ${CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT} CACHE STRING
35-
"Flags used by the linker during release builds.")
36-
37-
set (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
38-
${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT} CACHE STRING
39-
"Flags used by the linker during Release with Debug Info builds.")
40-
41-
set (CMAKE_SHARED_LINKER_FLAGS_DEBUG ${CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT} CACHE STRING
42-
"Flags used by the linker during debug builds.")
43-
44-
set (CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL ${CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL_INIT}
45-
CACHE STRING
46-
"Flags used by the linker during release minsize builds.")
47-
48-
set (CMAKE_SHARED_LINKER_FLAGS_RELEASE ${CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT} CACHE STRING
49-
"Flags used by the linker during release builds.")
50-
51-
set (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO
52-
${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT} CACHE STRING
53-
"Flags used by the linker during Release with Debug Info builds.")
54-
55-
set (CMAKE_MODULE_LINKER_FLAGS_DEBUG ${CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT} CACHE STRING
56-
"Flags used by the linker during debug builds.")
57-
58-
set (CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL ${CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL_INIT}
59-
CACHE STRING
60-
"Flags used by the linker during release minsize builds.")
61-
62-
set (CMAKE_MODULE_LINKER_FLAGS_RELEASE ${CMAKE_MODULE_LINKER_FLAGS_RELEASE_INIT} CACHE STRING
63-
"Flags used by the linker during release builds.")
64-
65-
set (CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO
66-
${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO_INIT} CACHE STRING
67-
"Flags used by the linker during Release with Debug Info builds.")
68-
69-
set (CMAKE_STATIC_LINKER_FLAGS_DEBUG ${CMAKE_STATIC_LINKER_FLAGS_DEBUG_INIT} CACHE STRING
70-
"Flags used by the linker during debug builds.")
71-
72-
set (CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL ${CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL_INIT}
73-
CACHE STRING
74-
"Flags used by the linker during release minsize builds.")
75-
76-
set (CMAKE_STATIC_LINKER_FLAGS_RELEASE ${CMAKE_STATIC_LINKER_FLAGS_RELEASE_INIT} CACHE STRING
77-
"Flags used by the linker during release builds.")
78-
79-
set (CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO
80-
${CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO_INIT} CACHE STRING
81-
"Flags used by the linker during Release with Debug Info builds.")
82-
endif()
83-
84-
# executable linker flags
85-
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS_INIT}"
86-
CACHE STRING "Flags used by the linker.")
87-
88-
# shared linker flags
89-
set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_INIT}"
90-
CACHE STRING "Flags used by the linker during the creation of dll's.")
91-
92-
# module linker flags
93-
set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS_INIT}"
94-
CACHE STRING "Flags used by the linker during the creation of modules.")
95-
96-
# static linker flags
97-
set (CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS_INIT}"
98-
CACHE STRING "Flags used by the linker during the creation of static libraries.")
13+
cmake_initialize_per_config_variable(CMAKE_EXE_LINKER_FLAGS "Flags used by the linker")
14+
cmake_initialize_per_config_variable(CMAKE_SHARED_LINKER_FLAGS "Flags used by the linker during the creation of shared libraries")
15+
cmake_initialize_per_config_variable(CMAKE_MODULE_LINKER_FLAGS "Flags used by the linker during the creation of modules")
16+
cmake_initialize_per_config_variable(CMAKE_STATIC_LINKER_FLAGS "Flags used by the linker during the creation of static libraries")
9917

10018
# Alias the build tool variable for backward compatibility.
10119
set(CMAKE_BUILD_TOOL ${CMAKE_MAKE_PROGRAM})
10220

10321
mark_as_advanced(
10422
CMAKE_VERBOSE_MAKEFILE
105-
106-
CMAKE_EXE_LINKER_FLAGS
107-
CMAKE_EXE_LINKER_FLAGS_DEBUG
108-
CMAKE_EXE_LINKER_FLAGS_MINSIZEREL
109-
CMAKE_EXE_LINKER_FLAGS_RELEASE
110-
CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
111-
112-
CMAKE_SHARED_LINKER_FLAGS
113-
CMAKE_SHARED_LINKER_FLAGS_DEBUG
114-
CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL
115-
CMAKE_SHARED_LINKER_FLAGS_RELEASE
116-
CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO
117-
118-
CMAKE_MODULE_LINKER_FLAGS
119-
CMAKE_MODULE_LINKER_FLAGS_DEBUG
120-
CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL
121-
CMAKE_MODULE_LINKER_FLAGS_RELEASE
122-
CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO
123-
124-
CMAKE_STATIC_LINKER_FLAGS
125-
CMAKE_STATIC_LINKER_FLAGS_DEBUG
126-
CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL
127-
CMAKE_STATIC_LINKER_FLAGS_RELEASE
128-
CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO
12923
)

‎Modules/CMakeFortranInformation.cmake

+1-25
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,7 @@ set(CMAKE_VERBOSE_MAKEFILE FALSE CACHE BOOL "If this value is on, makefiles will
159159

160160
set(CMAKE_Fortran_FLAGS_INIT "$ENV{FFLAGS} ${CMAKE_Fortran_FLAGS_INIT}")
161161

162-
foreach(c "" _DEBUG _RELEASE _MINSIZEREL _RELWITHDEBINFO)
163-
string(STRIP "${CMAKE_Fortran_FLAGS${c}_INIT}" CMAKE_Fortran_FLAGS${c}_INIT)
164-
endforeach()
165-
166-
set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS_INIT}" CACHE STRING
167-
"Flags used by the compiler during all build types.")
162+
cmake_initialize_per_config_variable(CMAKE_Fortran_FLAGS "Flags used by the Fortran compiler")
168163

169164
include(CMakeCommonLanguageInclude)
170165

@@ -216,24 +211,5 @@ if(CMAKE_Fortran_STANDARD_LIBRARIES_INIT)
216211
mark_as_advanced(CMAKE_Fortran_STANDARD_LIBRARIES)
217212
endif()
218213

219-
if(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
220-
set (CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG_INIT}" CACHE STRING
221-
"Flags used by the compiler during debug builds.")
222-
set (CMAKE_Fortran_FLAGS_MINSIZEREL "${CMAKE_Fortran_FLAGS_MINSIZEREL_INIT}" CACHE STRING
223-
"Flags used by the compiler during release builds for minimum size.")
224-
set (CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE_INIT}" CACHE STRING
225-
"Flags used by the compiler during release builds.")
226-
set (CMAKE_Fortran_FLAGS_RELWITHDEBINFO "${CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT}" CACHE STRING
227-
"Flags used by the compiler during release builds with debug info.")
228-
229-
endif()
230-
231-
mark_as_advanced(
232-
CMAKE_Fortran_FLAGS
233-
CMAKE_Fortran_FLAGS_DEBUG
234-
CMAKE_Fortran_FLAGS_MINSIZEREL
235-
CMAKE_Fortran_FLAGS_RELEASE
236-
CMAKE_Fortran_FLAGS_RELWITHDEBINFO)
237-
238214
# set this variable so we can avoid loading this more than once.
239215
set(CMAKE_Fortran_INFORMATION_LOADED 1)

‎Modules/CMakeGenericSystem.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
22
# file Copyright.txt or https://cmake.org/licensing for details.
33

4+
include(CMakeInitializeConfigs)
45

56
set(CMAKE_SHARED_LIBRARY_C_FLAGS "") # -pic
67
set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") # -shared

‎Modules/CMakeInitializeConfigs.cmake

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
2+
# file Copyright.txt or https://cmake.org/licensing for details.
3+
4+
include_guard(GLOBAL)
5+
6+
# Initializes `<_PREFIX>_<CONFIG>` variables from the corresponding
7+
# `<_PREFIX>_<CONFIG>_INIT`, for the configurations currently used.
8+
function(cmake_initialize_per_config_variable _PREFIX _DOCSTRING)
9+
string(STRIP "${${_PREFIX}_INIT}" _INIT)
10+
set("${_PREFIX}" "${_INIT}"
11+
CACHE STRING "${_DOCSTRING} during all build types.")
12+
mark_as_advanced("${_PREFIX}")
13+
14+
if (NOT CMAKE_NOT_USING_CONFIG_FLAGS)
15+
set(_CONFIGS Debug Release MinSizeRel RelWithDebInfo)
16+
17+
get_property(_GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
18+
if (_GENERATOR_IS_MULTI_CONFIG)
19+
list(APPEND _CONFIGS ${CMAKE_CONFIGURATION_TYPES})
20+
else()
21+
if (NOT CMAKE_NO_BUILD_TYPE)
22+
set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE_INIT}" CACHE STRING
23+
"Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel ...")
24+
endif()
25+
list(APPEND _CONFIGS ${CMAKE_BUILD_TYPE})
26+
endif()
27+
28+
list(REMOVE_DUPLICATES _CONFIGS)
29+
foreach(_BUILD_TYPE IN LISTS _CONFIGS)
30+
if (NOT "${_BUILD_TYPE}" STREQUAL "")
31+
string(TOUPPER "${_BUILD_TYPE}" _BUILD_TYPE)
32+
string(STRIP "${${_PREFIX}_${_BUILD_TYPE}_INIT}" _INIT)
33+
set("${_PREFIX}_${_BUILD_TYPE}" "${_INIT}"
34+
CACHE STRING "${_DOCSTRING} during ${_BUILD_TYPE} builds.")
35+
mark_as_advanced("${_PREFIX}_${_BUILD_TYPE}")
36+
endif()
37+
endforeach()
38+
endif()
39+
endfunction()

‎Modules/CMakeRCInformation.cmake

+1-24
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,7 @@ include(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL)
1919

2020
set(CMAKE_RC_FLAGS_INIT "$ENV{RCFLAGS} ${CMAKE_RC_FLAGS_INIT}")
2121

22-
foreach(c "" _DEBUG _RELEASE _MINSIZEREL _RELWITHDEBINFO)
23-
string(STRIP "${CMAKE_RC_FLAGS${c}_INIT}" CMAKE_RC_FLAGS${c}_INIT)
24-
endforeach()
25-
26-
set (CMAKE_RC_FLAGS "${CMAKE_RC_FLAGS_INIT}" CACHE STRING
27-
"Flags for Windows Resource Compiler.")
28-
29-
if(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
30-
set (CMAKE_RC_FLAGS_DEBUG "${CMAKE_RC_FLAGS_DEBUG_INIT}" CACHE STRING
31-
"Flags for Windows Resource Compiler during debug builds.")
32-
set (CMAKE_RC_FLAGS_MINSIZEREL "${CMAKE_RC_FLAGS_MINSIZEREL_INIT}" CACHE STRING
33-
"Flags for Windows Resource Compiler during release builds for minimum size.")
34-
set (CMAKE_RC_FLAGS_RELEASE "${CMAKE_RC_FLAGS_RELEASE_INIT}" CACHE STRING
35-
"Flags for Windows Resource Compiler during release builds.")
36-
set (CMAKE_RC_FLAGS_RELWITHDEBINFO "${CMAKE_RC_FLAGS_RELWITHDEBINFO_INIT}" CACHE STRING
37-
"Flags for Windows Resource Compiler during release builds with debug info.")
38-
endif()
22+
cmake_initialize_per_config_variable(CMAKE_RC_FLAGS "Flags for Windows Resource Compiler")
3923

4024
# These are the only types of flags that should be passed to the rc
4125
# command, if COMPILE_FLAGS is used on a target this will be used
@@ -51,12 +35,5 @@ if(NOT CMAKE_RC_COMPILE_OBJECT)
5135
"<CMAKE_RC_COMPILER> <DEFINES> <INCLUDES> <FLAGS> /fo<OBJECT> <SOURCE>")
5236
endif()
5337

54-
mark_as_advanced(
55-
CMAKE_RC_FLAGS
56-
CMAKE_RC_FLAGS_DEBUG
57-
CMAKE_RC_FLAGS_MINSIZEREL
58-
CMAKE_RC_FLAGS_RELEASE
59-
CMAKE_RC_FLAGS_RELWITHDEBINFO
60-
)
6138
# set this variable so we can avoid loading this more than once.
6239
set(CMAKE_RC_INFORMATION_LOADED 1)

‎Modules/CMakeSystemSpecificInformation.cmake

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ if(NOT _INCLUDED_SYSTEM_INFO_FILE)
3737
endif()
3838
endif()
3939

40-
4140
# optionally include a file which can do extra-generator specific things, e.g.
4241
# CMakeFindEclipseCDT4.cmake asks gcc for the system include dirs for the Eclipse CDT4 generator
4342
if(CMAKE_EXTRA_GENERATOR)

‎Modules/DeployQt4.cmake

+7-1
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,14 @@ function(install_qt4_plugin plugin executable copy installed_plugin_path_var)
298298

299299
get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
300300
if(_isMultiConfig OR CMAKE_BUILD_TYPE)
301-
install_qt4_plugin_path("${plugin_release}" "${executable}" "${copy}" "${installed_plugin_path_var}_release" "${plugins_dir}" "${component}" "Release|RelWithDebInfo|MinSizeRel")
301+
set(_RELEASE_CONFIGS ${CMAKE_CONFIGURATION_TYPES} "${CMAKE_BUILD_TYPE}")
302+
if (_RELEASE_CONFIGS)
303+
list(FILTER _RELEASE_CONFIGS EXCLUDE REGEX "[Dd][Ee][Bb][Uu][Gg]")
304+
endif()
305+
string(REPLACE ";" "|" _RELEASE_CONFIGS "${_RELEASE_CONFIGS}")
306+
install_qt4_plugin_path("${plugin_release}" "${executable}" "${copy}" "${installed_plugin_path_var}_release" "${plugins_dir}" "${component}" "${_RELEASE_CONFIGS}")
302307
install_qt4_plugin_path("${plugin_debug}" "${executable}" "${copy}" "${installed_plugin_path_var}_debug" "${plugins_dir}" "${component}" "Debug")
308+
unset(_RELEASE_CONFIGS)
303309

304310
if(CMAKE_BUILD_TYPE MATCHES "^Debug$")
305311
set(${installed_plugin_path_var} ${${installed_plugin_path_var}_debug})

‎Modules/FindCUDA.cmake

+1-18
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ set(CUDA_GENERATED_OUTPUT_DIR "" CACHE PATH "Directory to put all the output fil
524524
option(CUDA_HOST_COMPILATION_CPP "Generated file extension" ON)
525525

526526
# Extra user settable flags
527-
set(CUDA_NVCC_FLAGS "" CACHE STRING "Semi-colon delimit multiple arguments.")
527+
cmake_initialize_per_config_variable(CUDA_NVCC_FLAGS "Semi-colon delimit multiple arguments.")
528528

529529
if(CMAKE_GENERATOR MATCHES "Visual Studio")
530530
set(CUDA_HOST_COMPILER "$(VCInstallDir)bin" CACHE FILEPATH "Host side compiler used by NVCC")
@@ -578,23 +578,6 @@ mark_as_advanced(
578578
CUDA_SEPARABLE_COMPILATION
579579
)
580580

581-
# Single config generators like Makefiles or Ninja don't usually have
582-
# CMAKE_CONFIGURATION_TYPES defined (but note that it can be defined if set by
583-
# projects or developers). Even CMAKE_BUILD_TYPE might not be defined for
584-
# single config generators (and should not be defined for multi-config
585-
# generators). To ensure we get a complete superset of all possible
586-
# configurations, we combine CMAKE_CONFIGURATION_TYPES, CMAKE_BUILD_TYPE and
587-
# all of the standard configurations, then weed out duplicates with
588-
# list(REMOVE_DUPLICATES). Looping over the unique set then ensures we have
589-
# each configuration-specific set of nvcc flags defined and marked as advanced.
590-
set(CUDA_configuration_types ${CMAKE_CONFIGURATION_TYPES} ${CMAKE_BUILD_TYPE} Debug MinSizeRel Release RelWithDebInfo)
591-
list(REMOVE_DUPLICATES CUDA_configuration_types)
592-
foreach(config ${CUDA_configuration_types})
593-
string(TOUPPER ${config} config_upper)
594-
set(CUDA_NVCC_FLAGS_${config_upper} "" CACHE STRING "Semi-colon delimit multiple arguments.")
595-
mark_as_advanced(CUDA_NVCC_FLAGS_${config_upper})
596-
endforeach()
597-
598581
###############################################################################
599582
###############################################################################
600583
# Locate CUDA, Set Build Type, etc.

0 commit comments

Comments
 (0)
Please sign in to comment.