Browse Source

ENH: Cleanup chrpath feature by not displaying exe format or placing non-advanced options in cache.

Brad King 18 years ago
parent
commit
2b48e716b3
2 changed files with 3 additions and 5 deletions
  1. 2 4
      Modules/CMakeDetermineCompilerId.cmake
  2. 1 1
      Modules/CMakeFindBinUtils.cmake

+ 2 - 4
Modules/CMakeDetermineCompilerId.cmake

@@ -41,9 +41,7 @@ FUNCTION(CMAKE_DETERMINE_COMPILER_ID lang flagvar src)
 
   # 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 @@ FUNCTION(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file)
 
     # 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"

+ 1 - 1
Modules/CMakeFindBinUtils.cmake

@@ -85,5 +85,5 @@ IF("${CMAKE_EXECUTABLE_FORMAT}" STREQUAL "ELF"  AND NOT  CMAKE_CROSSCOMPILING)
   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)