[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.18.2.1 1.18.2.2

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt 
Log Message:
ENH: merge in fix for xcode 3.1 build from main tree


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmcurl/CMakeLists.txt,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -C 2 -d -r1.18.2.1 -r1.18.2.2
*** CMakeLists.txt	18 Mar 2008 14:23:55 -0000	1.18.2.1
--- CMakeLists.txt	18 Jul 2008 15:24:25 -0000	1.18.2.2
***************
*** 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)