Update cmake min version and cmake command convention
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
########################################################
|
||||
|
||||
# To use this option, copy both the macro and option code
|
||||
# into the root UserMacros.cmake file.
|
||||
# into the root UserMacros.cmake file.
|
||||
# OR add an include to the root UserMacros.cmake file:
|
||||
# INCLUDE(path_to_file/WINDOWS_MT.cmake)
|
||||
|
||||
@@ -19,23 +19,22 @@ MACRO (TARGET_STATIC_CRT_FLAGS)
|
||||
CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
|
||||
if (${flag_var} MATCHES "/MD")
|
||||
string (REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
|
||||
endif (${flag_var} MATCHES "/MD")
|
||||
endforeach (flag_var)
|
||||
endif ()
|
||||
endforeach ()
|
||||
foreach (flag_var
|
||||
CMAKE_Fortran_FLAGS CMAKE_Fortran_FLAGS_DEBUG CMAKE_Fortran_FLAGS_RELEASE
|
||||
CMAKE_Fortran_FLAGS_MINSIZEREL CMAKE_Fortran_FLAGS_RELWITHDEBINFO)
|
||||
if (${flag_var} MATCHES "/libs:dll")
|
||||
string (REGEX REPLACE "/libs:dll" "/libs:static" ${flag_var} "${${flag_var}}")
|
||||
endif (${flag_var} MATCHES "/libs:dll")
|
||||
endforeach (flag_var)
|
||||
endif ()
|
||||
endforeach ()
|
||||
set (WIN_COMPILE_FLAGS "")
|
||||
set (WIN_LINK_FLAGS "/NODEFAULTLIB:MSVCRT")
|
||||
endif (MSVC AND NOT BUILD_SHARED_LIBS)
|
||||
ENDMACRO (TARGET_STATIC_CRT_FLAGS)
|
||||
endif ()
|
||||
ENDMACRO ()
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
option (BUILD_STATIC_CRT_LIBS "Build With Static CRT Libraries" OFF)
|
||||
if (BUILD_STATIC_CRT_LIBS)
|
||||
TARGET_STATIC_CRT_FLAGS ()
|
||||
endif (BUILD_STATIC_CRT_LIBS)
|
||||
|
||||
endif ()
|
||||
|
||||
Reference in New Issue
Block a user