[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.19 1.20

cmake-commits at cmake.org cmake-commits at cmake.org
Thu Jul 17 15:19:27 EDT 2008


Update of /cvsroot/CMake/CMake/Utilities/cmcurl
In directory public:/mounts/ram/cvs-serv12501/Utilities/cmcurl

Modified Files:
	CMakeLists.txt 
Log Message:
COMP: Check for -Wno-long-double before using

Older GCC on the Mac warns for use of long double, so we use
-Wno-long-double.  Newer GCC on the Mac does not have this flag and
gives an error.  We now check for the flag before using it.
See bug #7357.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmcurl/CMakeLists.txt,v
retrieving revision 1.19
retrieving revision 1.20
diff -C 2 -d -r1.19 -r1.20
*** CMakeLists.txt	17 Mar 2008 20:22:28 -0000	1.19
--- CMakeLists.txt	17 Jul 2008 19:19:25 -0000	1.20
***************
*** 676,688 ****
  
  IF(CMAKE_COMPILER_IS_GNUCC AND APPLE)
!   # The Mac version of GCC warns about use of long double.  Disable it.
!   GET_SOURCE_FILE_PROPERTY(MPRINTF_COMPILE_FLAGS mprintf.c COMPILE_FLAGS)
!   IF(MPRINTF_COMPILE_FLAGS)
!     SET(MPRINTF_COMPILE_FLAGS "${MPRINTF_COMPILE_FLAGS} -Wno-long-double")
!   ELSE(MPRINTF_COMPILE_FLAGS)
!     SET(MPRINTF_COMPILE_FLAGS "-Wno-long-double")
!   ENDIF(MPRINTF_COMPILE_FLAGS)
!   SET_SOURCE_FILES_PROPERTIES(mprintf.c PROPERTIES
!     COMPILE_FLAGS ${MPRINTF_COMPILE_FLAGS})
  ENDIF(CMAKE_COMPILER_IS_GNUCC AND APPLE)
  
--- 676,692 ----
  
  IF(CMAKE_COMPILER_IS_GNUCC AND APPLE)
!   INCLUDE(CheckCCompilerFlag)
!   CHECK_C_COMPILER_FLAG(-Wno-long-double HAVE_C_FLAG_Wno_long_double)
!   IF(HAVE_C_FLAG_Wno_long_double)
!     # The Mac version of GCC warns about use of long double.  Disable it.
!     GET_SOURCE_FILE_PROPERTY(MPRINTF_COMPILE_FLAGS mprintf.c COMPILE_FLAGS)
!     IF(MPRINTF_COMPILE_FLAGS)
!       SET(MPRINTF_COMPILE_FLAGS "${MPRINTF_COMPILE_FLAGS} -Wno-long-double")
!     ELSE(MPRINTF_COMPILE_FLAGS)
!       SET(MPRINTF_COMPILE_FLAGS "-Wno-long-double")
!     ENDIF(MPRINTF_COMPILE_FLAGS)
!     SET_SOURCE_FILES_PROPERTIES(mprintf.c PROPERTIES
!       COMPILE_FLAGS ${MPRINTF_COMPILE_FLAGS})
!   ENDIF(HAVE_C_FLAG_Wno_long_double)
  ENDIF(CMAKE_COMPILER_IS_GNUCC AND APPLE)
  



More information about the Cmake-commits mailing list