[cmake-commits] king committed CMakeCInformation.cmake 1.17 1.18 CMakeCXXInformation.cmake 1.20 1.21

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Jan 14 09:20:59 EST 2008


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

Modified Files:
	CMakeCInformation.cmake CMakeCXXInformation.cmake 
Log Message:
ENH: Create COMPILE_DEFINITIONS property for targets and source files.  Create <config>_COMPILE_DEFINITIONS property as per-configuration version.  Add Preprocess test to test the feature.  Document limitations on Xcode and VS6 generators.


Index: CMakeCXXInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCXXInformation.cmake,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- CMakeCXXInformation.cmake	17 Dec 2007 17:04:15 -0000	1.20
+++ CMakeCXXInformation.cmake	14 Jan 2008 14:20:57 -0000	1.21
@@ -201,7 +201,7 @@
 # compile a C++ file into an object file
 IF(NOT CMAKE_CXX_COMPILE_OBJECT)
   SET(CMAKE_CXX_COMPILE_OBJECT
-    "<CMAKE_CXX_COMPILER>  <FLAGS> -o <OBJECT> -c <SOURCE>")
+    "<CMAKE_CXX_COMPILER>  <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>")
 ENDIF(NOT CMAKE_CXX_COMPILE_OBJECT)
 
 IF(NOT CMAKE_CXX_LINK_EXECUTABLE)

Index: CMakeCInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCInformation.cmake,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- CMakeCInformation.cmake	17 Dec 2007 17:04:15 -0000	1.17
+++ CMakeCInformation.cmake	14 Jan 2008 14:20:57 -0000	1.18
@@ -141,7 +141,7 @@
 # compile a C file into an object file
 IF(NOT CMAKE_C_COMPILE_OBJECT)
   SET(CMAKE_C_COMPILE_OBJECT
-    "<CMAKE_C_COMPILER> <FLAGS> -o <OBJECT>   -c <SOURCE>")
+    "<CMAKE_C_COMPILER> <DEFINES> <FLAGS> -o <OBJECT>   -c <SOURCE>")
 ENDIF(NOT CMAKE_C_COMPILE_OBJECT)
 
 IF(NOT CMAKE_C_LINK_EXECUTABLE)



More information about the Cmake-commits mailing list