[cmake-commits] alex committed CMakeDetermineCCompiler.cmake 1.39.2.5 1.39.2.6 CMakeDetermineCXXCompiler.cmake 1.34.2.4 1.34.2.5 CMakeDetermineFortranCompiler.cmake 1.14 1.14.4.1 CMakeFindBinUtils.cmake NONE 1.1.2.1 CMakeLists.txt 1.9 1.9.2.1

cmake-commits at cmake.org cmake-commits at cmake.org
Mon May 14 11:08:02 EDT 2007 

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

Modified Files:
      Tag: CMake-CrossCompileBasic
	CMakeDetermineCCompiler.cmake CMakeDetermineCXXCompiler.cmake 
	CMakeDetermineFortranCompiler.cmake CMakeLists.txt 
Added Files:
      Tag: CMake-CrossCompileBasic
	CMakeFindBinUtils.cmake 
Log Message:

ENH: -added new CMakeFindBinUtils.cmake to have less code duplication in
CMakeDetermineC/C++?FortranCompiler.cmake, 
-added CMAKE_INSTALL_NAME_TOOL variable, only run install_name_tool handling
if this was found

Alex


Index: CMakeDetermineCXXCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineCXXCompiler.cmake,v
retrieving revision 1.34.2.4
retrieving revision 1.34.2.5
diff -u -d -r1.34.2.4 -r1.34.2.5
--- CMakeDetermineCXXCompiler.cmake	11 May 2007 20:25:09 -0000	1.34.2.4
+++ CMakeDetermineCXXCompiler.cmake	14 May 2007 15:07:59 -0000	1.34.2.5
@@ -86,23 +86,7 @@
   ENDIF (COMPILER_BASENAME MATCHES "^(.+-)[gc]\\+\\+")
 ENDIF (NOT CMAKE_TOOLCHAIN_PREFIX)
 
-FIND_PROGRAM(CMAKE_AR NAMES ${CMAKE_TOOLCHAIN_PREFIX}ar PATHS ${CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
-FIND_PROGRAM(CMAKE_AR NAMES ${CMAKE_TOOLCHAIN_PREFIX}ar)
-MARK_AS_ADVANCED(CMAKE_AR)
-
-FIND_PROGRAM(CMAKE_RANLIB NAMES ${CMAKE_TOOLCHAIN_PREFIX}ranlib ${CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
-FIND_PROGRAM(CMAKE_RANLIB NAMES ${CMAKE_TOOLCHAIN_PREFIX}ranlib)
-IF(NOT CMAKE_RANLIB)
-   SET(CMAKE_RANLIB : CACHE INTERNAL "noop for ranlib")
-ENDIF(NOT CMAKE_RANLIB)
-MARK_AS_ADVANCED(CMAKE_RANLIB)
-
-# used in cpack
-FIND_PROGRAM(CMAKE_STRIP_COMMAND NAMES ${CMAKE_TOOLCHAIN_PREFIX}strip PATHS ${CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
-FIND_PROGRAM(CMAKE_STRIP_COMMAND NAMES ${CMAKE_TOOLCHAIN_PREFIX}strip)
-MARK_AS_ADVANCED(CMAKE_STRIP_COMMAND)
-
-# maybe check for more tools from binutils here ?
+INCLUDE(CMakeFindBinUtils)
 
 # 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

Index: CMakeDetermineFortranCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineFortranCompiler.cmake,v
retrieving revision 1.14
retrieving revision 1.14.4.1
diff -u -d -r1.14 -r1.14.4.1
--- CMakeDetermineFortranCompiler.cmake	21 Feb 2007 15:03:11 -0000	1.14
+++ CMakeDetermineFortranCompiler.cmake	14 May 2007 15:07:59 -0000	1.14.4.1
@@ -66,13 +66,7 @@
 
 MARK_AS_ADVANCED(CMAKE_Fortran_COMPILER)  
 
-FIND_PROGRAM(CMAKE_AR NAMES ar )
-
-FIND_PROGRAM(CMAKE_RANLIB NAMES ranlib)
-IF(NOT CMAKE_RANLIB)
-   SET(CMAKE_RANLIB : CACHE INTERNAL "noop for ranlib")
-ENDIF(NOT CMAKE_RANLIB)
-MARK_AS_ADVANCED(CMAKE_RANLIB)
+INCLUDE(CMakeFindBinUtils)
 
 # do not test for GNU if the generator is visual studio
 IF(${CMAKE_GENERATOR} MATCHES "Visual Studio")
@@ -113,5 +107,4 @@
 # configure variables set in this file for fast reload later on
 CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeFortranCompiler.cmake.in 
   ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeFortranCompiler.cmake IMMEDIATE)
-MARK_AS_ADVANCED(CMAKE_AR)
 SET(CMAKE_Fortran_COMPILER_ENV_VAR "FC")

--- NEW FILE: CMakeFindBinUtils.cmake ---

# search for additional tools required for C/C++ (and other languages ?)
#
# If the cmake variable CMAKE_TOOLCHAIN_PREFIX is set, this is used as
# prefix for the tools (e.g. arm-elf-gcc etc.)
# If the cmake variable CMAKE_TOOLCHAIN_LOCATION is set, the compiler is
# searched only there. The other tools are at first searched there, then 
# also in the default locations.
#
# Sets the following variables: 
#   CMAKE_AR
#   CMAKE_RANLIB
#   CMAKE_STRIP
#   CMAKE_INSTALL_NAME_TOOL


FIND_PROGRAM(CMAKE_AR NAMES ${CMAKE_TOOLCHAIN_PREFIX}ar PATHS ${CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
FIND_PROGRAM(CMAKE_AR NAMES ${CMAKE_TOOLCHAIN_PREFIX}ar)

FIND_PROGRAM(CMAKE_RANLIB NAMES ${CMAKE_TOOLCHAIN_PREFIX}ranlib ${CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
FIND_PROGRAM(CMAKE_RANLIB NAMES ${CMAKE_TOOLCHAIN_PREFIX}ranlib)
IF(NOT CMAKE_RANLIB)
   SET(CMAKE_RANLIB : CACHE INTERNAL "noop for ranlib")
ENDIF(NOT CMAKE_RANLIB)

# used in cpack
FIND_PROGRAM(CMAKE_STRIP NAMES ${CMAKE_TOOLCHAIN_PREFIX}strip PATHS ${CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
FIND_PROGRAM(CMAKE_STRIP NAMES ${CMAKE_TOOLCHAIN_PREFIX}strip)

# should only exist on OSX, used for installing
FIND_PROGRAM(CMAKE_INSTALL_NAME_TOOL NAMES install_name_tool PATHS ${CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
FIND_PROGRAM(CMAKE_INSTALL_NAME_TOOL NAMES install_name_tool)

MARK_AS_ADVANCED(CMAKE_AR CMAKE_RANLIB CMAKE_STRIP CMAKE_INSTALL_NAME_TOOL)

# maybe check for more tools ?

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeLists.txt,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -d -r1.9 -r1.9.2.1
--- CMakeLists.txt	30 Apr 2007 22:09:04 -0000	1.9
+++ CMakeLists.txt	14 May 2007 15:07:59 -0000	1.9.2.1
@@ -1,4 +1,6 @@
 # just install the modules
+# new file added, force rerunning cmake
+
 SUBDIRS(Platform)
 INSTALL_FILES(${CMAKE_DATA_DIR}/Modules .*\\.cmake$)
 INSTALL_FILES(${CMAKE_DATA_DIR}/Modules .*\\.cpp$)

Index: CMakeDetermineCCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineCCompiler.cmake,v
retrieving revision 1.39.2.5
retrieving revision 1.39.2.6
diff -u -d -r1.39.2.5 -r1.39.2.6
--- CMakeDetermineCCompiler.cmake	11 May 2007 20:25:09 -0000	1.39.2.5
+++ CMakeDetermineCCompiler.cmake	14 May 2007 15:07:59 -0000	1.39.2.6
@@ -86,23 +86,7 @@
   ENDIF (COMPILER_BASENAME MATCHES "^(.+-)g?cc")
 ENDIF (NOT CMAKE_TOOLCHAIN_PREFIX)
 
-FIND_PROGRAM(CMAKE_AR NAMES ${CMAKE_TOOLCHAIN_PREFIX}ar PATHS ${CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
-FIND_PROGRAM(CMAKE_AR NAMES ${CMAKE_TOOLCHAIN_PREFIX}ar)
-MARK_AS_ADVANCED(CMAKE_AR)
-
-FIND_PROGRAM(CMAKE_RANLIB NAMES ${CMAKE_TOOLCHAIN_PREFIX}ranlib ${CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
-FIND_PROGRAM(CMAKE_RANLIB NAMES ${CMAKE_TOOLCHAIN_PREFIX}ranlib)
-IF(NOT CMAKE_RANLIB)
-   SET(CMAKE_RANLIB : CACHE INTERNAL "noop for ranlib")
-ENDIF(NOT CMAKE_RANLIB)
-MARK_AS_ADVANCED(CMAKE_RANLIB)
-
-# used in cpack
-FIND_PROGRAM(CMAKE_STRIP_COMMAND NAMES ${CMAKE_TOOLCHAIN_PREFIX}strip PATHS ${CMAKE_TOOLCHAIN_LOCATION} NO_DEFAULT_PATH)
-FIND_PROGRAM(CMAKE_STRIP_COMMAND NAMES ${CMAKE_TOOLCHAIN_PREFIX}strip)
-MARK_AS_ADVANCED(CMAKE_STRIP_COMMAND)
-
-# maybe check for more tools from binutils here ?
+INCLUDE(CMakeFindBinUtils)
 
 # 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

More information about the Cmake-commits mailing list