[Cmake-commits] [cmake-commits] alex committed CMakeLists.txt 1.17 1.18 CMakeSystemSpecificInformation.cmake 1.43 1.44 CMakeFindKDevelop3.cmake NONE 1.1 CMakeFindCodeBlocks.cmake NONE 1.1 CMakeFindEclipseCDT4.cmake NONE 1.1

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt CMakeSystemSpecificInformation.cmake 
Added Files:
	CMakeFindKDevelop3.cmake CMakeFindCodeBlocks.cmake 
	CMakeFindEclipseCDT4.cmake 
Log Message:
STYLE: rename the files from CMake<GENERATOR>.cmake to
CMakeFind<GENERATOR>.cmake, so it is more consistent e.g. with
CMakeFindXcode.cmake

Alex


Index: CMakeSystemSpecificInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeSystemSpecificInformation.cmake,v
retrieving revision 1.43
retrieving revision 1.44
diff -C 2 -d -r1.43 -r1.44
*** CMakeSystemSpecificInformation.cmake	10 May 2009 10:00:27 -0000	1.43
--- CMakeSystemSpecificInformation.cmake	12 May 2009 19:11:16 -0000	1.44
***************
*** 37,44 ****
  
  # optionally include a file which can do extra-generator specific things, e.g.
! # CMakeEclipseCDT4.cmake asks gcc for the system include dirs for the Eclipse CDT4 generator
  IF(CMAKE_EXTRA_GENERATOR)
    STRING(REPLACE " " "" _CMAKE_EXTRA_GENERATOR_NO_SPACES ${CMAKE_EXTRA_GENERATOR} )
!   INCLUDE("CMake${_CMAKE_EXTRA_GENERATOR_NO_SPACES}" OPTIONAL)
  ENDIF(CMAKE_EXTRA_GENERATOR)
  
--- 37,44 ----
  
  # optionally include a file which can do extra-generator specific things, e.g.
! # CMakeFindEclipseCDT4.cmake asks gcc for the system include dirs for the Eclipse CDT4 generator
  IF(CMAKE_EXTRA_GENERATOR)
    STRING(REPLACE " " "" _CMAKE_EXTRA_GENERATOR_NO_SPACES ${CMAKE_EXTRA_GENERATOR} )
!   INCLUDE("CMakeFind${_CMAKE_EXTRA_GENERATOR_NO_SPACES}" OPTIONAL)
  ENDIF(CMAKE_EXTRA_GENERATOR)
  

--- NEW FILE: CMakeFindEclipseCDT4.cmake ---
# This file is included in CMakeSystemSpecificInformation.cmake if
# the Eclipse CDT4 extra generator has been selected.

FIND_PROGRAM(CMAKE_ECLIPSE_EXECUTABLE NAMES eclipse DOC "The Eclipse executable")


# The Eclipse generator needs to know the standard include path
# so that Eclipse ca find the headers at runtime and parsing etc. works better
# This is done here by actually running gcc with the options so it prints its
# system include directories, which are parsed then and stored in the cache.
MACRO(_DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang _result)
  SET(${_result})
  SET(_gccOutput)
  FILE(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy" "\n" )
  EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -v -E -x ${_lang} dummy
                  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeFiles
                  ERROR_VARIABLE _gccOutput
                  OUTPUT_QUIET )
  FILE(REMOVE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy")

  IF( "${_gccOutput}" MATCHES "> search starts here[^\n]+\n *(.+) *\n *End of (search) list" )
    SET(${_result} ${CMAKE_MATCH_1})
    STRING(REPLACE "\n" " " ${_result} "${${_result}}")
    SEPARATE_ARGUMENTS(${_result})
  ENDIF( "${_gccOutput}" MATCHES "> search starts here[^\n]+\n *(.+) *\n *End of (search) list" )
ENDMACRO(_DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang)

# Now check for C
IF ("${CMAKE_C_COMPILER_ID}" MATCHES GNU  AND NOT  CMAKE_ECLIPSE_C_SYSTEM_INCLUDE_DIRS)
  _DETERMINE_GCC_SYSTEM_INCLUDE_DIRS(c _dirs)
  SET(CMAKE_ECLIPSE_C_SYSTEM_INCLUDE_DIRS "${_dirs}" CACHE INTERNAL "C compiler system include directories")
ENDIF ("${CMAKE_C_COMPILER_ID}" MATCHES GNU  AND NOT  CMAKE_ECLIPSE_C_SYSTEM_INCLUDE_DIRS)

# And now the same for C++
IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES GNU  AND NOT  CMAKE_ECLIPSE_CXX_SYSTEM_INCLUDE_DIRS)
  _DETERMINE_GCC_SYSTEM_INCLUDE_DIRS(c++ _dirs)
  SET(CMAKE_ECLIPSE_CXX_SYSTEM_INCLUDE_DIRS "${_dirs}" CACHE INTERNAL "CXX compiler system include directories")
ENDIF ("${CMAKE_CXX_COMPILER_ID}" MATCHES GNU  AND NOT  CMAKE_ECLIPSE_CXX_SYSTEM_INCLUDE_DIRS)


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeLists.txt,v
retrieving revision 1.17
retrieving revision 1.18
diff -C 2 -d -r1.17 -r1.18
*** CMakeLists.txt	10 Jan 2008 19:47:00 -0000	1.17
--- CMakeLists.txt	12 May 2009 19:11:16 -0000	1.18
***************
*** 1,4 ****
  # just install the modules
! # new file added, force rerunning cmake 
  
  SUBDIRS(Platform)
--- 1,4 ----
  # just install the modules
! ## new file added, force rerunning cmake
  
  SUBDIRS(Platform)

--- NEW FILE: CMakeFindCodeBlocks.cmake ---
# This file is included in CMakeSystemSpecificInformation.cmake if
# the CodeBlocks extra generator has been selected.

FIND_PROGRAM(CMAKE_CODEBLOCKS_EXECUTABLE NAMES codeblocks DOC "The CodeBlocks executable")

IF(CMAKE_CODEBLOCKS_EXECUTABLE)
   SET(CMAKE_OPEN_PROJECT_COMMAND "${CMAKE_CODEBLOCKS_EXECUTABLE} <PROJECT_FILE>" )
ENDIF(CMAKE_CODEBLOCKS_EXECUTABLE)


--- NEW FILE: CMakeFindKDevelop3.cmake ---
# This file is included in CMakeSystemSpecificInformation.cmake if
# the KDevelop3 extra generator has been selected.

FIND_PROGRAM(CMAKE_KDEVELOP3_EXECUTABLE NAMES kdevelop DOC "The KDevelop3 executable")

IF(CMAKE_KDEVELOP3_EXECUTABLE)
   SET(CMAKE_OPEN_PROJECT_COMMAND "${CMAKE_KDEVELOP3_EXECUTABLE} <PROJECT_FILE>" )
ENDIF(CMAKE_KDEVELOP3_EXECUTABLE)