From 352fb9ff66787f6eaffdfa964794de62877bd965 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 10 May 2009 06:00:27 -0400 Subject: ENH: move the code which queries gcc for the system include dirs from CMakeSystemSpecificInformation.cmake into a separate file, CMakeEclipseCDT4.cmake -if CMAKE_EXTRA_GENERATOR is set, i.e. either CodeBlocks or KDevelop3 or EclipseCDT4, load a matching cmake script file, which can do things specific for this generator - added such files for Eclipse, KDevelop and CodeBlocks, one thing they all do is they try to find the respective IDE and store it in the CMAKE_(KDEVELOP3|CODEBLOCKS|ECLIPSE)_EXECUTABLE variable. This could be used by cmake-gui to open the project it just generated with the gui (not sure this is possible with eclipse). Alex --- Modules/CMakeCodeBlocks.cmake | 5 ++++ Modules/CMakeEclipseCDT4.cmake | 39 ++++++++++++++++++++++++++ Modules/CMakeKDevelop3.cmake | 5 ++++ Modules/CMakeSystemSpecificInformation.cmake | 42 ++++------------------------ 4 files changed, 55 insertions(+), 36 deletions(-) create mode 100644 Modules/CMakeCodeBlocks.cmake create mode 100644 Modules/CMakeEclipseCDT4.cmake create mode 100644 Modules/CMakeKDevelop3.cmake diff --git a/Modules/CMakeCodeBlocks.cmake b/Modules/CMakeCodeBlocks.cmake new file mode 100644 index 0000000..2139943 --- /dev/null +++ b/Modules/CMakeCodeBlocks.cmake @@ -0,0 +1,5 @@ +# 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") + diff --git a/Modules/CMakeEclipseCDT4.cmake b/Modules/CMakeEclipseCDT4.cmake new file mode 100644 index 0000000..db466fc --- /dev/null +++ b/Modules/CMakeEclipseCDT4.cmake @@ -0,0 +1,39 @@ +# 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) + diff --git a/Modules/CMakeKDevelop3.cmake b/Modules/CMakeKDevelop3.cmake new file mode 100644 index 0000000..9167967 --- /dev/null +++ b/Modules/CMakeKDevelop3.cmake @@ -0,0 +1,5 @@ +# 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") + diff --git a/Modules/CMakeSystemSpecificInformation.cmake b/Modules/CMakeSystemSpecificInformation.cmake index d845221..5aa83b3 100644 --- a/Modules/CMakeSystemSpecificInformation.cmake +++ b/Modules/CMakeSystemSpecificInformation.cmake @@ -35,42 +35,12 @@ IF(NOT _INCLUDED_SYSTEM_INFO_FILE) ENDIF(NOT _INCLUDED_SYSTEM_INFO_FILE) -# 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. -IF("${CMAKE_EXTRA_GENERATOR}" MATCHES "Eclipse") - - 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) - -ENDIF("${CMAKE_EXTRA_GENERATOR}" MATCHES "Eclipse") +# 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) # for most systems a module is the same as a shared library -- cgit v0.12