diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-11-30 17:52:27 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-11-30 17:52:27 (GMT) |
| commit | 84c944ad7bb94729b19fda40dc72eb9b4df3298a (patch) | |
| tree | 86ecff19d43c17fe4b42a65cf8361a3b177e65d2 /CMakeLists.txt | |
| parent | 77fcd586044ca9f1f880937a5f424b6cea4fd94e (diff) | |
| download | hdf5-84c944ad7bb94729b19fda40dc72eb9b4df3298a.zip hdf5-84c944ad7bb94729b19fda40dc72eb9b4df3298a.tar.gz hdf5-84c944ad7bb94729b19fda40dc72eb9b4df3298a.tar.bz2 | |
[svn-r21781] Correct macros for building static libs on linux when CMAKE_BUILD_TYPE is defined.
Also correct use of CMAKE_ANSI_FLAGS for passing into sub-projects.
Tested: local linux
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a0f2f2b..d70b15a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -303,17 +303,6 @@ IF (BUILD_STATIC_EXECS) ENDIF (BUILD_STATIC_EXECS) #----------------------------------------------------------------------------- -# Option to Build Static PIC -#----------------------------------------------------------------------------- -OPTION (BUILD_STATIC_PIC "Build Static PIC" OFF) -IF (BUILD_STATIC_PIC) - IF (NOT WIN32) - SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") - ENDIF (NOT WIN32) -ENDIF (BUILD_STATIC_PIC) - -#----------------------------------------------------------------------------- # Option to use code coverage #----------------------------------------------------------------------------- OPTION (HDF5_ENABLE_COVERAGE "Enable code coverage for Libraries and Programs" OFF) @@ -408,6 +397,13 @@ IF (CMAKE_COMPILER_IS_GNUCC) SET (CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS} -std=c99 -fomit-frame-pointer -finline-functions -fno-common") ENDIF (CMAKE_BUILD_TYPE MATCHES Debug) ENDIF (CMAKE_COMPILER_IS_GNUCC) +IF (CMAKE_COMPILER_IS_GNUCXX) + IF (CMAKE_BUILD_TYPE MATCHES Debug) + SET (CMAKE_CXX_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_CXX_FLAGS} -finline-functions -fno-common") + ELSE (CMAKE_BUILD_TYPE MATCHES Debug) + SET (CMAKE_CXX_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_CXX_FLAGS} -fomit-frame-pointer -finline-functions -fno-common") + ENDIF (CMAKE_BUILD_TYPE MATCHES Debug) +ENDIF (CMAKE_COMPILER_IS_GNUCXX) #----------------------------------------------------------------------------- # Option to embed library info into executables @@ -426,9 +422,10 @@ IF (HDF5_DISABLE_COMPILER_WARNINGS) # warning level is given, so remove it. IF (MSVC) SET (HDF5_WARNINGS_BLOCKED 1) - STRING (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " - CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") + STRING (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /w") + STRING (REGEX REPLACE "(^| )([/-])W[0-9]( |$)" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /w") ENDIF (MSVC) IF (WIN32 AND NOT CYGWIN) ADD_DEFINITIONS (-D_CRT_SECURE_NO_WARNINGS) @@ -442,6 +439,7 @@ IF (HDF5_DISABLE_COMPILER_WARNINGS) # Most compilers use -w to suppress warnings. IF (NOT HDF5_WARNINGS_BLOCKED) SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w") + SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") ENDIF (NOT HDF5_WARNINGS_BLOCKED) ENDIF (HDF5_DISABLE_COMPILER_WARNINGS) |