[cmake-commits] king committed CMakeDetermineCompilerId.cmake 1.16 1.17 CMakeFindBinUtils.cmake 1.13 1.14

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeDetermineCompilerId.cmake CMakeFindBinUtils.cmake 
Log Message:
ENH: Cleanup chrpath feature by not displaying exe format or placing non-advanced options in cache.


Index: CMakeFindBinUtils.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeFindBinUtils.cmake,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- CMakeFindBinUtils.cmake	16 Jan 2008 00:56:42 -0000	1.13
+++ CMakeFindBinUtils.cmake	22 Jan 2008 01:57:23 -0000	1.14
@@ -85,5 +85,5 @@
   FIND_PROGRAM(CMAKE_CHRPATH chrpath PATHS ${_CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
   FIND_PROGRAM(CMAKE_CHRPATH chrpath)
 
-  MARK_AS_ADVANCED(CMAKE_CHRPATH)
+  MARK_AS_ADVANCED(CMAKE_CHRPATH CMAKE_USE_CHRPATH)
 ENDIF("${CMAKE_EXECUTABLE_FORMAT}" STREQUAL "ELF"  AND NOT  CMAKE_CROSSCOMPILING)

Index: CMakeDetermineCompilerId.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineCompilerId.cmake,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- CMakeDetermineCompilerId.cmake	18 Jan 2008 20:52:53 -0000	1.16
+++ CMakeDetermineCompilerId.cmake	22 Jan 2008 01:57:23 -0000	1.17
@@ -41,9 +41,7 @@
 
   # if the format is unknown after all files have been checked, put "Unknown" in the cache
   IF(NOT CMAKE_EXECUTABLE_FORMAT)
-    SET(CMAKE_EXECUTABLE_FORMAT "Unknown" CACHE STRING "Executable file format")
-  ELSE(NOT CMAKE_EXECUTABLE_FORMAT)
-    MESSAGE(STATUS "The executable file format is ${CMAKE_EXECUTABLE_FORMAT}")
+    SET(CMAKE_EXECUTABLE_FORMAT "Unknown" CACHE INTERNAL "Executable file format")
   ENDIF(NOT CMAKE_EXECUTABLE_FORMAT)
 
   # Display the final identification result.
@@ -200,7 +198,7 @@
 
     # ELF files start with 0x7f"ELF"
     IF("${CMAKE_EXECUTABLE_MAGIC}" STREQUAL "7f454c46")
-      SET(CMAKE_EXECUTABLE_FORMAT "ELF" CACHE STRING "Executable file format")
+      SET(CMAKE_EXECUTABLE_FORMAT "ELF" CACHE INTERNAL "Executable file format")
     ENDIF("${CMAKE_EXECUTABLE_MAGIC}" STREQUAL "7f454c46")
 
 #    # COFF (.exe) files start with "MZ"