[cmake-commits] alex committed CMakeCCompiler.cmake.in 1.15 1.16 CMakeCInformation.cmake 1.13 1.14 CMakeCXXCompiler.cmake.in 1.14 1.15 CMakeCXXInformation.cmake 1.16 1.17 CMakeDetermineCCompiler.cmake 1.44 1.45 CMakeDetermineCXXCompiler.cmake 1.37 1.38

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeCCompiler.cmake.in CMakeCInformation.cmake 
	CMakeCXXCompiler.cmake.in CMakeCXXInformation.cmake 
	CMakeDetermineCCompiler.cmake CMakeDetermineCXXCompiler.cmake 
Log Message:

ENH: split cmGlobalGenerator::SetLanguageEnabled() in two parts, where the
second part copies the values from the cmake variables into internal maps.
So this can now be done after the compiler-specific information has been
loaded, which can now overwrite more settings.

Alex


Index: CMakeDetermineCXXCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineCXXCompiler.cmake,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- CMakeDetermineCXXCompiler.cmake	21 May 2007 14:58:04 -0000	1.37
+++ CMakeDetermineCXXCompiler.cmake	11 Jun 2007 19:31:42 -0000	1.38
@@ -103,17 +103,6 @@
 ENDIF (NOT _CMAKE_TOOLCHAIN_SUFFIX)
 
 
-# some exotic compilers have different extensions (e.g. sdcc uses .rel)
-# so don't overwrite it if it has been already defined by the user
-IF(NOT CMAKE_CXX_OUTPUT_EXTENSION)
-  IF(UNIX)
-    SET(CMAKE_CXX_OUTPUT_EXTENSION .o)
-  ELSE(UNIX)
-    SET(CMAKE_CXX_OUTPUT_EXTENSION .obj)
-  ENDIF(UNIX)
-ENDIF(NOT CMAKE_CXX_OUTPUT_EXTENSION)
-
-
 # This block was used before the compiler was identified by building a
 # source file.  Unless g++ crashes when building a small C++
 # executable this should no longer be needed.

Index: CMakeCInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCInformation.cmake,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- CMakeCInformation.cmake	5 Jun 2007 14:28:43 -0000	1.13
+++ CMakeCInformation.cmake	11 Jun 2007 19:31:42 -0000	1.14
@@ -5,6 +5,14 @@
 # It also loads a system - compiler - processor (or target hardware)
 # specific file, which is mainly useful for crosscompiling and embedded systems.
 
+# some compilers use different extensions (e.g. sdcc uses .rel)
+# so set the extension here first so it can be overridden by the compiler specific file
+IF(UNIX)
+  SET(CMAKE_C_OUTPUT_EXTENSION .o)
+ELSE(UNIX)
+  SET(CMAKE_C_OUTPUT_EXTENSION .obj)
+ENDIF(UNIX)
+
 GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_C_COMPILER} NAME_WE)
 IF(CMAKE_COMPILER_IS_GNUCC)
   SET(CMAKE_BASE_NAME gcc)

Index: CMakeCXXCompiler.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCXXCompiler.cmake.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- CMakeCXXCompiler.cmake.in	17 May 2007 17:20:43 -0000	1.14
+++ CMakeCXXCompiler.cmake.in	11 Jun 2007 19:31:42 -0000	1.15
@@ -22,7 +22,6 @@
 SET(CMAKE_CXX_IGNORE_EXTENSIONS inl;h;H;o;O;obj;OBJ;def;DEF;rc;RC)
 SET(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;m;mm)
 SET(CMAKE_CXX_LINKER_PREFERENCE Prefered)
-SET(CMAKE_CXX_OUTPUT_EXTENSION @CMAKE_CXX_OUTPUT_EXTENSION@)
 
 # save the size of void* in case where cache is removed
 # and the this file is still around

Index: CMakeCCompiler.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCCompiler.cmake.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- CMakeCCompiler.cmake.in	17 May 2007 17:20:43 -0000	1.15
+++ CMakeCCompiler.cmake.in	11 Jun 2007 19:31:42 -0000	1.16
@@ -22,7 +22,6 @@
 SET(CMAKE_C_SOURCE_FILE_EXTENSIONS c)
 SET(CMAKE_C_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC)
 SET(CMAKE_C_LINKER_PREFERENCE None)
-SET(CMAKE_C_OUTPUT_EXTENSION @CMAKE_C_OUTPUT_EXTENSION@)
 
 # save the size of void* in case where cache is removed
 # and the this file is still around

Index: CMakeCXXInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCXXInformation.cmake,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- CMakeCXXInformation.cmake	5 Jun 2007 14:28:43 -0000	1.16
+++ CMakeCXXInformation.cmake	11 Jun 2007 19:31:42 -0000	1.17
@@ -5,6 +5,15 @@
 # It also loads a system - compiler - processor (or target hardware)
 # specific file, which is mainly useful for crosscompiling and embedded systems.
 
+# some compilers use different extensions (e.g. sdcc uses .rel)
+# so set the extension here first so it can be overridden by the compiler specific file
+IF(UNIX)
+  SET(CMAKE_CXX_OUTPUT_EXTENSION .o)
+ELSE(UNIX)
+  SET(CMAKE_CXX_OUTPUT_EXTENSION .obj)
+ENDIF(UNIX)
+
+
 GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_CXX_COMPILER} NAME_WE)
 # since the gnu compiler has several names force g++
 IF(CMAKE_COMPILER_IS_GNUCXX)

Index: CMakeDetermineCCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineCCompiler.cmake,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- CMakeDetermineCCompiler.cmake	24 May 2007 12:33:05 -0000	1.44
+++ CMakeDetermineCCompiler.cmake	11 Jun 2007 19:31:42 -0000	1.45
@@ -105,17 +105,6 @@
   ENDIF (COMPILER_BASENAME MATCHES "^cl(.+)\\.exe$")
 ENDIF (NOT _CMAKE_TOOLCHAIN_SUFFIX)
 
-# some exotic compilers have different extensions (e.g. sdcc uses .rel)
-# so don't overwrite it if it has been already defined by the user
-IF(NOT CMAKE_C_OUTPUT_EXTENSION)
-  IF(UNIX)
-    SET(CMAKE_C_OUTPUT_EXTENSION .o)
-  ELSE(UNIX)
-    SET(CMAKE_C_OUTPUT_EXTENSION .obj)
-  ENDIF(UNIX)
-ENDIF(NOT CMAKE_C_OUTPUT_EXTENSION)
-
-
 # Build a small source file to identify the compiler.
 IF(${CMAKE_GENERATOR} MATCHES "Visual Studio")
   SET(CMAKE_C_COMPILER_ID_RUN 1)