[cmake-commits] alex committed CMakeASMCompiler.cmake.in 1.1 1.2 CMakeCCompiler.cmake.in 1.16 1.17 CMakeCXXCompiler.cmake.in 1.15 1.16 CMakeForceCompiler.cmake 1.1 1.2 CMakeFortranCompiler.cmake.in 1.8 1.9 CMakeJavaCompiler.cmake.in 1.8 1.9 CMakeLists.txt 1.13 1.14

Wed Jul 11 16:22:06 EDT 2007

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

Modified Files:
	CMakeASMCompiler.cmake.in CMakeCCompiler.cmake.in 
	CMakeCXXCompiler.cmake.in CMakeForceCompiler.cmake 
	CMakeFortranCompiler.cmake.in CMakeJavaCompiler.cmake.in 
	CMakeLists.txt 
Log Message:

ENH: CMAKE_<LANG>_LINKER_PREFERENCE is now an integer priority, not a
two-step priority (None or Prefered)
Current order: ASM 0, C 10, Fortran 20, CXX 30, Java 40
This is the same order as automake choses:
http://www.gnu.org/software/automake/manual/html_node/How-the-Linker-is-Chosen.html

This change should be backward compatible:
if there is a project using fortran and CXX, they had to set the
LINKER_LANGUAGE explicitely, otherwise cmake complained (but still generated
the project files). Explicitely setting the linker language still overrides
automatic detection.
If somebody has a custom language for cmake and the PREFERENCE starts with
"P", its changed to 100, which gives it preference over all other languages
(except the other custom languages which have also "Prefered"). "None" is
converted to 0.

Alex


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeLists.txt,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14

--- CMakeLists.txt	22 Jun 2007 14:22:27 -0000	1.13
+++ CMakeLists.txt	11 Jul 2007 20:22:04 -0000	1.14
@@ -1,5 +1,5 @@
 # just install the modules
-# new file added, force rerunning cmake #
+# new file added, force rerunning cmake
 
 SUBDIRS(Platform)
 INSTALL_FILES(${CMAKE_DATA_DIR}/Modules .*\\.cmake$)

Index: CMakeASMCompiler.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeASMCompiler.cmake.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CMakeASMCompiler.cmake.in	28 Jun 2007 13:14:27 -0000	1.1
+++ CMakeASMCompiler.cmake.in	11 Jul 2007 20:22:04 -0000	1.2
@@ -7,5 +7,5 @@
 SET(CMAKE_ASM at ASM_DIALECT@_COMPILER_ENV_VAR "@_CMAKE_ASM_COMPILER_ENV_VAR@")
 
 SET(CMAKE_ASM at ASM_DIALECT@_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC)
-SET(CMAKE_ASM at ASM_DIALECT@_LINKER_PREFERENCE None)
+SET(CMAKE_ASM at ASM_DIALECT@_LINKER_PREFERENCE 0)
 

Index: CMakeCXXCompiler.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCXXCompiler.cmake.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- CMakeCXXCompiler.cmake.in	11 Jun 2007 19:31:42 -0000	1.15
+++ CMakeCXXCompiler.cmake.in	11 Jul 2007 20:22:04 -0000	1.16
@@ -21,7 +21,7 @@
 SET(CMAKE_CXX_COMPILER_ID_RUN 1)
 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_LINKER_PREFERENCE 30)
 
 # save the size of void* in case where cache is removed
 # and the this file is still around

Index: CMakeForceCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeForceCompiler.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CMakeForceCompiler.cmake	2 Jul 2007 18:18:16 -0000	1.1
+++ CMakeForceCompiler.cmake	11 Jul 2007 20:22:04 -0000	1.2
@@ -38,6 +38,12 @@
   SET(CMAKE_C_COMPILER_ID_RUN TRUE)
   SET(CMAKE_C_COMPILER_ID ${id})
   SET(CMAKE_C_COMPILER_WORKS TRUE)
+
+  # Set old compiler and platform id variables.
+  IF("${CMAKE_C_COMPILER_ID}" MATCHES "GNU")
+    SET(CMAKE_COMPILER_IS_GNUCC 1)
+  ENDIF("${CMAKE_C_COMPILER_ID}" MATCHES "GNU")
+
   SET(CMAKE_SIZEOF_VOID_P ${sizeof_void} CACHE STRING "sizeof void")
   SET(HAVE_CMAKE_SIZEOF_VOID_P TRUE CACHE INTERNAL "have sizeof void")
 ENDMACRO(CMAKE_FORCE_C_COMPILER)
@@ -47,5 +53,10 @@
   SET(CMAKE_CXX_COMPILER_ID_RUN TRUE)
   SET(CMAKE_CXX_COMPILER_ID ${id})
   SET(CMAKE_CXX_COMPILER_WORKS TRUE)
+
+  IF("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+    SET(CMAKE_COMPILER_IS_GNUCXX 1)
+  ENDIF("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+
 ENDMACRO(CMAKE_FORCE_CXX_COMPILER)
 

Index: CMakeCCompiler.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCCompiler.cmake.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- CMakeCCompiler.cmake.in	11 Jun 2007 19:31:42 -0000	1.16
+++ CMakeCCompiler.cmake.in	11 Jul 2007 20:22:04 -0000	1.17
@@ -21,7 +21,7 @@
 SET(CMAKE_C_COMPILER_ID_RUN 1)
 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_LINKER_PREFERENCE 10)
 
 # save the size of void* in case where cache is removed
 # and the this file is still around

Index: CMakeJavaCompiler.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeJavaCompiler.cmake.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- CMakeJavaCompiler.cmake.in	20 Jul 2005 19:44:55 -0000	1.8
+++ CMakeJavaCompiler.cmake.in	11 Jul 2007 20:22:04 -0000	1.9
@@ -5,7 +5,7 @@
 SET(CMAKE_Java_COMPILER_LOADED 1)
 
 SET(CMAKE_Java_SOURCE_FILE_EXTENSIONS java)
-SET(CMAKE_Java_LINKER_PREFERENCE Prefered)
+SET(CMAKE_Java_LINKER_PREFERENCE 40)
 SET(CMAKE_Java_OUTPUT_EXTENSION .class)
 SET(CMAKE_STATIC_LIBRARY_PREFIX_Java "")
 SET(CMAKE_STATIC_LIBRARY_SUFFIX_Java ".jar")

Index: CMakeFortranCompiler.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeFortranCompiler.cmake.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- CMakeFortranCompiler.cmake.in	3 May 2007 12:24:32 -0000	1.8
+++ CMakeFortranCompiler.cmake.in	11 Jul 2007 20:22:04 -0000	1.9
@@ -21,7 +21,7 @@
 SET(CMAKE_Fortran_COMPILER_ID_RUN 1)
 SET(CMAKE_Fortran_SOURCE_FILE_EXTENSIONS f;F;f77;F77;f90;F90;for;f95;F95)
 SET(CMAKE_Fortran_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC)
-SET(CMAKE_Fortran_LINKER_PREFERENCE Prefered)
+SET(CMAKE_Fortran_LINKER_PREFERENCE 20)
 IF(UNIX)
   SET(CMAKE_Fortran_OUTPUT_EXTENSION .o)
 ELSE(UNIX)

