[cmake-commits] alex committed CMakeASMCompiler.cmake.in 1.3 1.4 CMakeCCompiler.cmake.in 1.18 1.19 CMakeCXXCompiler.cmake.in 1.17 1.18 CMakeForceCompiler.cmake 1.3 1.4 CMakeFortranCompiler.cmake.in 1.10 1.11 CMakeJavaCompiler.cmake.in 1.10 1.11

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeASMCompiler.cmake.in CMakeCCompiler.cmake.in 
	CMakeCXXCompiler.cmake.in CMakeForceCompiler.cmake 
	CMakeFortranCompiler.cmake.in CMakeJavaCompiler.cmake.in 
Log Message:
ENH: second try for handling the linker language with integer priority values (returning a pointer to a string on the stack is no good idea)

Alex


Index: CMakeASMCompiler.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeASMCompiler.cmake.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CMakeASMCompiler.cmake.in	11 Jul 2007 21:29:27 -0000	1.3
+++ CMakeASMCompiler.cmake.in	12 Jul 2007 12:37:10 -0000	1.4
@@ -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.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- CMakeCXXCompiler.cmake.in	11 Jul 2007 21:29:27 -0000	1.17
+++ CMakeCXXCompiler.cmake.in	12 Jul 2007 12:37:10 -0000	1.18
@@ -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.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CMakeForceCompiler.cmake	11 Jul 2007 21:29:27 -0000	1.3
+++ CMakeForceCompiler.cmake	12 Jul 2007 12:37:10 -0000	1.4
@@ -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.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- CMakeCCompiler.cmake.in	11 Jul 2007 21:29:27 -0000	1.18
+++ CMakeCCompiler.cmake.in	12 Jul 2007 12:37:10 -0000	1.19
@@ -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.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- CMakeJavaCompiler.cmake.in	11 Jul 2007 21:29:27 -0000	1.10
+++ CMakeJavaCompiler.cmake.in	12 Jul 2007 12:37:10 -0000	1.11
@@ -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.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- CMakeFortranCompiler.cmake.in	11 Jul 2007 21:29:27 -0000	1.10
+++ CMakeFortranCompiler.cmake.in	12 Jul 2007 12:37:10 -0000	1.11
@@ -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)