[cmake-commits] hoffman committed CMakeCInformation.cmake 1.16 1.17 CMakeCXXInformation.cmake 1.19 1.20 CMakeFortranInformation.cmake 1.14 1.15

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeCInformation.cmake CMakeCXXInformation.cmake 
	CMakeFortranInformation.cmake 
Log Message:
BUG: fix for bug 6167 get rid of extra space in flags


Index: CMakeCXXInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCXXInformation.cmake,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- CMakeCXXInformation.cmake	2 Jul 2007 17:29:36 -0000	1.19
+++ CMakeCXXInformation.cmake	17 Dec 2007 17:04:15 -0000	1.20
@@ -125,9 +125,12 @@
 # on the initial values computed in the platform/*.cmake files
 # 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} ${CMAKE_CXX_FLAGS_INIT}" CACHE STRING
+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

Index: CMakeFortranInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeFortranInformation.cmake,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- CMakeFortranInformation.cmake	3 May 2007 12:24:32 -0000	1.14
+++ CMakeFortranInformation.cmake	17 Dec 2007 17:04:15 -0000	1.15
@@ -86,8 +86,11 @@
 
 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} ${CMAKE_Fortran_FLAGS_INIT}" CACHE STRING
+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)
 
 
 

Index: CMakeCInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCInformation.cmake,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- CMakeCInformation.cmake	2 Jul 2007 17:29:36 -0000	1.16
+++ CMakeCInformation.cmake	17 Dec 2007 17:04:15 -0000	1.17
@@ -62,8 +62,11 @@
   SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS})
 ENDIF(NOT CMAKE_MODULE_EXISTS)
 
-SET (CMAKE_C_FLAGS "$ENV{CFLAGS} ${CMAKE_C_FLAGS_INIT}" CACHE STRING
+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)
 # default build type is none