[Cmake-commits] [cmake-commits] hoffman committed CMakeCInformation.cmake 1.20 1.21 CMakeCXXInformation.cmake 1.24 1.25 CMakeFortranInformation.cmake 1.18 1.19

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv8047

Modified Files:
	CMakeCInformation.cmake CMakeCXXInformation.cmake 
	CMakeFortranInformation.cmake 
Log Message:
ENH: fix init flags getting stuffed into the compile line by force.


Index: CMakeCXXInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCXXInformation.cmake,v
retrieving revision 1.24
retrieving revision 1.25
diff -C 2 -d -r1.24 -r1.25
*** CMakeCXXInformation.cmake	1 Feb 2008 13:56:00 -0000	1.24
--- CMakeCXXInformation.cmake	21 Apr 2008 17:04:15 -0000	1.25
***************
*** 146,156 ****
  # use _INIT variables so that this only happens the first time
  # and you can set these flags in the cmake cache
! SET (CMAKE_CXX_FLAGS "$ENV{CXXFLAGS}" CACHE STRING
       "Flags used by the compiler during all build types.")
  
- IF (CMAKE_CXX_FLAGS_INIT)
-     SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_INIT}")
- ENDIF (CMAKE_CXX_FLAGS_INIT)
- 
  IF(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
    SET (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG_INIT}" CACHE STRING
--- 146,157 ----
  # use _INIT variables so that this only happens the first time
  # and you can set these flags in the cmake cache
! SET(CMAKE_CXX_FLAGS_INIT "$ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS_INIT}")
! # avoid just having a space as the initial value for the cache 
! IF(CMAKE_CXX_FLAGS_INIT STREQUAL " ")
!   SET(CMAKE_CXX_FLAGS_INIT)
! ENDIF(CMAKE_CXX_FLAGS_INIT STREQUAL " ")
! SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_INIT}" CACHE STRING
       "Flags used by the compiler during all build types.")
  
  IF(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
    SET (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG_INIT}" CACHE STRING

Index: CMakeFortranInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeFortranInformation.cmake,v
retrieving revision 1.18
retrieving revision 1.19
diff -C 2 -d -r1.18 -r1.19
*** CMakeFortranInformation.cmake	1 Feb 2008 13:56:00 -0000	1.18
--- CMakeFortranInformation.cmake	21 Apr 2008 17:04:15 -0000	1.19
***************
*** 107,117 ****
  SET(CMAKE_VERBOSE_MAKEFILE FALSE CACHE BOOL "If this value is on, makefiles will be generated without the .SILENT directive, and all commands will be echoed to the console during the make.  This is useful for debugging only. With Visual Studio IDE projects all commands are done without /nologo.")
  
! SET (CMAKE_Fortran_FLAGS "$ENV{FFLAGS}" CACHE STRING
       "Flags for Fortran compiler.")
- IF (CMAKE_Fortran_FLAGS_INIT)
-     SET (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${CMAKE_Fortran_FLAGS_INIT}")
- ENDIF (CMAKE_Fortran_FLAGS_INIT)
- 
- 
  
  INCLUDE(CMakeCommonLanguageInclude)
--- 107,117 ----
  SET(CMAKE_VERBOSE_MAKEFILE FALSE CACHE BOOL "If this value is on, makefiles will be generated without the .SILENT directive, and all commands will be echoed to the console during the make.  This is useful for debugging only. With Visual Studio IDE projects all commands are done without /nologo.")
  
! SET(CMAKE_Fortran_FLAGS_INIT "$ENV{FFFLAGS} ${CMAKE_Fortran_FLAGS_INIT}")
! # avoid just having a space as the initial value for the cache 
! IF(CMAKE_Fortran_FLAGS_INIT STREQUAL " ")
!   SET(CMAKE_Fortran_FLAGS_INIT)
! ENDIF(CMAKE_Fortran_FLAGS_INIT STREQUAL " ")
! SET (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS_INIT}" CACHE STRING
       "Flags for Fortran compiler.")
  
  INCLUDE(CMakeCommonLanguageInclude)

Index: CMakeCInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCInformation.cmake,v
retrieving revision 1.20
retrieving revision 1.21
diff -C 2 -d -r1.20 -r1.21
*** CMakeCInformation.cmake	1 Feb 2008 13:56:00 -0000	1.20
--- CMakeCInformation.cmake	21 Apr 2008 17:04:15 -0000	1.21
***************
*** 63,71 ****
  ENDIF(NOT CMAKE_MODULE_EXISTS)
  
! SET (CMAKE_C_FLAGS "$ENV{CFLAGS}" CACHE STRING
!      "Flags for C compiler.")
! IF (CMAKE_C_FLAGS_INIT)
!     SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_INIT}")
! ENDIF (CMAKE_C_FLAGS_INIT)
  
  IF(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
--- 63,73 ----
  ENDIF(NOT CMAKE_MODULE_EXISTS)
  
! SET(CMAKE_C_FLAGS_INIT "$ENV{CFLAGS} ${CMAKE_C_FLAGS_INIT}")
! # avoid just having a space as the initial value for the cache 
! IF(CMAKE_C_FLAGS_INIT STREQUAL " ")
!   SET(CMAKE_C_FLAGS_INIT)
! ENDIF(CMAKE_C_FLAGS_INIT STREQUAL " ")
! SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS_INIT}" CACHE STRING
!      "Flags used by the compiler during all build types.")
  
  IF(NOT CMAKE_NOT_USING_CONFIG_FLAGS)