diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2013-06-17 16:43:33 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2013-06-17 16:43:33 (GMT) |
| commit | 8f9fb4a106f383fa8e6b7fef40fbfae39592ebed (patch) | |
| tree | cb863cea83ce40fc19958aeb566dbe7e403a0f82 /UserMacros.cmake | |
| parent | 47190b32e52e4c20f9243d0872f75e702f2479f4 (diff) | |
| download | hdf5-8f9fb4a106f383fa8e6b7fef40fbfae39592ebed.zip hdf5-8f9fb4a106f383fa8e6b7fef40fbfae39592ebed.tar.gz hdf5-8f9fb4a106f383fa8e6b7fef40fbfae39592ebed.tar.bz2 | |
[svn-r23789] Remove COMPILE_FLAGS value - already set in X_FLAGS
Diffstat (limited to 'UserMacros.cmake')
| -rw-r--r-- | UserMacros.cmake | 39 |
1 files changed, 10 insertions, 29 deletions
diff --git a/UserMacros.cmake b/UserMacros.cmake index bf609e5..d7d3ef9 100644 --- a/UserMacros.cmake +++ b/UserMacros.cmake @@ -3,34 +3,15 @@ ######################################################## #----------------------------------------------------------------------------- -# Option to Build with Static CRT libraries on Windows -#------------------------------------------------------------------------------- -MACRO (TARGET_STATIC_CRT_FLAGS) - IF (MSVC AND NOT BUILD_SHARED_LIBS) - FOREACH (flag_var - CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE - CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO - CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE - 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) - 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) - SET (WIN_COMPILE_FLAGS "/MT") - SET (WIN_LINK_FLAGS "/NODEFAULTLIB:MSVCRT") - ENDIF (MSVC AND NOT BUILD_SHARED_LIBS) -ENDMACRO (TARGET_STATIC_CRT_FLAGS) - +# Option to Build with User Defined Values #----------------------------------------------------------------------------- -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) +MACRO (MACRO_USER_DEFINED_LIBS) + SET (USER_DEFINED_VALUE "FALSE") +ENDMACRO (MACRO_USER_DEFINED_LIBS) + +#------------------------------------------------------------------------------- +OPTION (BUILD_USER_DEFINED_LIBS "Build With User Defined Values" OFF) +IF (BUILD_USER_DEFINED_LIBS) + MACRO_USER_DEFINED_LIBS () +ENDIF (BUILD_USER_DEFINED_LIBS)
\ No newline at end of file |