Merge topic 'lang-flag-var-helpstrings'
5d2452d
Fix CMAKE_(C|CXX|Fortran)_STANDARD_LIBRARIES helpstrings (#14622)2b77b53
Make CMAKE_(C|CXX|Fortran)_<CONFIG> help strings more consistent (#14606)424c6fc
Fix CMAKE_(C|CXX|Fortran)_RELEASE helpstrings (#14606)
This commit is contained in:
commit
2e8ce4d516
|
@ -119,16 +119,16 @@ if(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
|
||||||
set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG_INIT}" CACHE STRING
|
set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG_INIT}" CACHE STRING
|
||||||
"Flags used by the compiler during debug builds.")
|
"Flags used by the compiler during debug builds.")
|
||||||
set (CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL_INIT}" CACHE STRING
|
set (CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL_INIT}" CACHE STRING
|
||||||
"Flags used by the compiler during release minsize builds.")
|
"Flags used by the compiler during release builds for minimum size.")
|
||||||
set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE_INIT}" CACHE STRING
|
set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE_INIT}" CACHE STRING
|
||||||
"Flags used by the compiler during release builds (/MD /Ob1 /Oi /Ot /Oy /Gs will produce slightly less optimized but smaller files).")
|
"Flags used by the compiler during release builds.")
|
||||||
set (CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO_INIT}" CACHE STRING
|
set (CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO_INIT}" CACHE STRING
|
||||||
"Flags used by the compiler during Release with Debug Info builds.")
|
"Flags used by the compiler during release builds with debug info.")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(CMAKE_C_STANDARD_LIBRARIES_INIT)
|
if(CMAKE_C_STANDARD_LIBRARIES_INIT)
|
||||||
set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES_INIT}"
|
set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES_INIT}"
|
||||||
CACHE STRING "Libraries linked by defalut with all C applications.")
|
CACHE STRING "Libraries linked by default with all C applications.")
|
||||||
mark_as_advanced(CMAKE_C_STANDARD_LIBRARIES)
|
mark_as_advanced(CMAKE_C_STANDARD_LIBRARIES)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
|
@ -209,17 +209,17 @@ if(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
|
||||||
set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG_INIT}" CACHE STRING
|
set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG_INIT}" CACHE STRING
|
||||||
"Flags used by the compiler during debug builds.")
|
"Flags used by the compiler during debug builds.")
|
||||||
set (CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL_INIT}" CACHE STRING
|
set (CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL_INIT}" CACHE STRING
|
||||||
"Flags used by the compiler during release minsize builds.")
|
"Flags used by the compiler during release builds for minimum size.")
|
||||||
set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE_INIT}" CACHE STRING
|
set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE_INIT}" CACHE STRING
|
||||||
"Flags used by the compiler during release builds (/MD /Ob1 /Oi /Ot /Oy /Gs will produce slightly less optimized but smaller files).")
|
"Flags used by the compiler during release builds.")
|
||||||
set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT}" CACHE STRING
|
set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT}" CACHE STRING
|
||||||
"Flags used by the compiler during Release with Debug Info builds.")
|
"Flags used by the compiler during release builds with debug info.")
|
||||||
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(CMAKE_CXX_STANDARD_LIBRARIES_INIT)
|
if(CMAKE_CXX_STANDARD_LIBRARIES_INIT)
|
||||||
set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES_INIT}"
|
set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES_INIT}"
|
||||||
CACHE STRING "Libraries linked by defalut with all C++ applications.")
|
CACHE STRING "Libraries linked by default with all C++ applications.")
|
||||||
mark_as_advanced(CMAKE_CXX_STANDARD_LIBRARIES)
|
mark_as_advanced(CMAKE_CXX_STANDARD_LIBRARIES)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
|
@ -218,7 +218,7 @@ endif()
|
||||||
|
|
||||||
if(CMAKE_Fortran_STANDARD_LIBRARIES_INIT)
|
if(CMAKE_Fortran_STANDARD_LIBRARIES_INIT)
|
||||||
set(CMAKE_Fortran_STANDARD_LIBRARIES "${CMAKE_Fortran_STANDARD_LIBRARIES_INIT}"
|
set(CMAKE_Fortran_STANDARD_LIBRARIES "${CMAKE_Fortran_STANDARD_LIBRARIES_INIT}"
|
||||||
CACHE STRING "Libraries linked by defalut with all Fortran applications.")
|
CACHE STRING "Libraries linked by default with all Fortran applications.")
|
||||||
mark_as_advanced(CMAKE_Fortran_STANDARD_LIBRARIES)
|
mark_as_advanced(CMAKE_Fortran_STANDARD_LIBRARIES)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -226,11 +226,11 @@ if(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
|
||||||
set (CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG_INIT}" CACHE STRING
|
set (CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG_INIT}" CACHE STRING
|
||||||
"Flags used by the compiler during debug builds.")
|
"Flags used by the compiler during debug builds.")
|
||||||
set (CMAKE_Fortran_FLAGS_MINSIZEREL "${CMAKE_Fortran_FLAGS_MINSIZEREL_INIT}" CACHE STRING
|
set (CMAKE_Fortran_FLAGS_MINSIZEREL "${CMAKE_Fortran_FLAGS_MINSIZEREL_INIT}" CACHE STRING
|
||||||
"Flags used by the compiler during release minsize builds.")
|
"Flags used by the compiler during release builds for minimum size.")
|
||||||
set (CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE_INIT}" CACHE STRING
|
set (CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE_INIT}" CACHE STRING
|
||||||
"Flags used by the compiler during release builds (/MD /Ob1 /Oi /Ot /Oy /Gs will produce slightly less optimized but smaller files).")
|
"Flags used by the compiler during release builds.")
|
||||||
set (CMAKE_Fortran_FLAGS_RELWITHDEBINFO "${CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT}" CACHE STRING
|
set (CMAKE_Fortran_FLAGS_RELWITHDEBINFO "${CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT}" CACHE STRING
|
||||||
"Flags used by the compiler during Release with Debug Info builds.")
|
"Flags used by the compiler during release builds with debug info.")
|
||||||
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue