Also put builtin include dirs into CodeBlocks project file
Refactor code from CMakeFindEclipseCDT4.cmake so it can be used alkso for CodeBlocks, and move it into new file CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake. Alex
This commit is contained in:
Alex Neundorf
parent
92c0dc50fc
commit
e2e8c0a412
|
|
@ -0,0 +1,118 @@
|
||||||
|
|
||||||
|
#=============================================================================
|
||||||
|
# Copyright 2009 Kitware, Inc.
|
||||||
|
#
|
||||||
|
# Distributed under the OSI-approved BSD License (the "License");
|
||||||
|
# see accompanying file Copyright.txt for details.
|
||||||
|
#
|
||||||
|
# This software is distributed WITHOUT ANY WARRANTY; without even the
|
||||||
|
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
# See the License for more information.
|
||||||
|
#=============================================================================
|
||||||
|
# (To distribute this file outside of CMake, substitute the full
|
||||||
|
# License text for the above reference.)
|
||||||
|
|
||||||
|
# This file is included by CMakeFindEclipseCDT4.cmake and CMakeFindCodeBlocks.cmake
|
||||||
|
|
||||||
|
# The Eclipse and the CodeBlocks generators need to know the standard include path
|
||||||
|
# so that they can 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 _resultIncludeDirs _resultDefines)
|
||||||
|
SET(${_resultIncludeDirs})
|
||||||
|
SET(_gccOutput)
|
||||||
|
FILE(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy" "\n" )
|
||||||
|
|
||||||
|
IF (${_lang} STREQUAL "c++")
|
||||||
|
SET(_compilerExecutable "${CMAKE_CXX_COMPILER}")
|
||||||
|
ELSE ()
|
||||||
|
SET(_compilerExecutable "${CMAKE_C_COMPILER}")
|
||||||
|
ENDIF ()
|
||||||
|
EXECUTE_PROCESS(COMMAND ${_compilerExecutable} -v -E -x ${_lang} -dD dummy
|
||||||
|
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeFiles
|
||||||
|
ERROR_VARIABLE _gccOutput
|
||||||
|
OUTPUT_VARIABLE _gccStdout )
|
||||||
|
FILE(REMOVE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy")
|
||||||
|
|
||||||
|
# First find the system include dirs:
|
||||||
|
IF( "${_gccOutput}" MATCHES "> search starts here[^\n]+\n *(.+ *\n) *End of (search) list" )
|
||||||
|
|
||||||
|
# split the output into lines and then remove leading and trailing spaces from each of them:
|
||||||
|
STRING(REGEX MATCHALL "[^\n]+\n" _includeLines "${CMAKE_MATCH_1}")
|
||||||
|
FOREACH(nextLine ${_includeLines})
|
||||||
|
STRING(STRIP "${nextLine}" _includePath)
|
||||||
|
LIST(APPEND ${_resultIncludeDirs} "${_includePath}")
|
||||||
|
ENDFOREACH(nextLine)
|
||||||
|
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
|
|
||||||
|
# now find the builtin macros:
|
||||||
|
STRING(REGEX MATCHALL "#define[^\n]+\n" _defineLines "${_gccStdout}")
|
||||||
|
# A few example lines which the regexp below has to match properly:
|
||||||
|
# #define MAX(a,b) ((a) > (b) ? (a) : (b))
|
||||||
|
# #define __fastcall __attribute__((__fastcall__))
|
||||||
|
# #define FOO (23)
|
||||||
|
# #define __UINTMAX_TYPE__ long long unsigned int
|
||||||
|
# #define __UINTMAX_TYPE__ long long unsigned int
|
||||||
|
# #define __i386__ 1
|
||||||
|
|
||||||
|
FOREACH(nextLine ${_defineLines})
|
||||||
|
STRING(REGEX MATCH "^#define +([A-Za-z_][A-Za-z0-9_]*)(\\([^\\)]+\\))? +(.+) *$" _dummy "${nextLine}")
|
||||||
|
SET(_name "${CMAKE_MATCH_1}${CMAKE_MATCH_2}")
|
||||||
|
STRING(STRIP "${CMAKE_MATCH_3}" _value)
|
||||||
|
#MESSAGE(STATUS "m1: -${CMAKE_MATCH_1}- m2: -${CMAKE_MATCH_2}- m3: -${CMAKE_MATCH_3}-")
|
||||||
|
|
||||||
|
LIST(APPEND ${_resultDefines} "${_name}")
|
||||||
|
IF(_value)
|
||||||
|
LIST(APPEND ${_resultDefines} "${_value}")
|
||||||
|
ELSE()
|
||||||
|
LIST(APPEND ${_resultDefines} " ")
|
||||||
|
ENDIF()
|
||||||
|
ENDFOREACH(nextLine)
|
||||||
|
|
||||||
|
ENDMACRO(_DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang)
|
||||||
|
|
||||||
|
# Save the current LC_ALL, LC_MESSAGES, and LANG environment variables and set them
|
||||||
|
# to "C" that way GCC's "search starts here" text is in English and we can grok it.
|
||||||
|
SET(_orig_lc_all $ENV{LC_ALL})
|
||||||
|
SET(_orig_lc_messages $ENV{LC_MESSAGES})
|
||||||
|
SET(_orig_lang $ENV{LANG})
|
||||||
|
IF(_orig_lc_all)
|
||||||
|
SET(ENV{LC_ALL} C)
|
||||||
|
ENDIF()
|
||||||
|
IF(_orig_lc_messages)
|
||||||
|
SET(ENV{LC_MESSAGES} C)
|
||||||
|
ENDIF()
|
||||||
|
IF(_orig_lang)
|
||||||
|
SET(ENV{LANG} C)
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
|
# Now check for C, works for gcc and Intel compiler at least
|
||||||
|
IF (NOT CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS)
|
||||||
|
IF ("${CMAKE_C_COMPILER_ID}" MATCHES GNU OR "${CMAKE_C_COMPILER_ID}" MATCHES Intel)
|
||||||
|
_DETERMINE_GCC_SYSTEM_INCLUDE_DIRS(c _dirs _defines)
|
||||||
|
SET(CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS "${_dirs}" CACHE INTERNAL "C compiler system include directories")
|
||||||
|
SET(CMAKE_EXTRA_GENERATOR_C_SYSTEM_DEFINED_MACROS "${_defines}" CACHE INTERNAL "C compiler system defined macros")
|
||||||
|
ENDIF ()
|
||||||
|
ENDIF ()
|
||||||
|
|
||||||
|
# And now the same for C++
|
||||||
|
IF (NOT CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_INCLUDE_DIRS)
|
||||||
|
IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES GNU OR "${CMAKE_CXX_COMPILER_ID}" MATCHES Intel)
|
||||||
|
_DETERMINE_GCC_SYSTEM_INCLUDE_DIRS(c++ _dirs _defines)
|
||||||
|
SET(CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_INCLUDE_DIRS "${_dirs}" CACHE INTERNAL "CXX compiler system include directories")
|
||||||
|
SET(CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS "${_defines}" CACHE INTERNAL "CXX compiler system defined macros")
|
||||||
|
ENDIF ()
|
||||||
|
ENDIF ()
|
||||||
|
|
||||||
|
# Restore original LC_ALL, LC_MESSAGES, and LANG
|
||||||
|
IF(_orig_lc_all)
|
||||||
|
SET(ENV{LC_ALL} ${_orig_lc_all})
|
||||||
|
ENDIF()
|
||||||
|
IF(_orig_lc_messages)
|
||||||
|
SET(ENV{LC_MESSAGES} ${_orig_lc_messages})
|
||||||
|
ENDIF()
|
||||||
|
IF(_orig_lang)
|
||||||
|
SET(ENV{LANG} ${_orig_lang})
|
||||||
|
ENDIF()
|
||||||
|
|
@ -21,3 +21,5 @@ IF(CMAKE_CODEBLOCKS_EXECUTABLE)
|
||||||
SET(CMAKE_OPEN_PROJECT_COMMAND "${CMAKE_CODEBLOCKS_EXECUTABLE} <PROJECT_FILE>" )
|
SET(CMAKE_OPEN_PROJECT_COMMAND "${CMAKE_CODEBLOCKS_EXECUTABLE} <PROJECT_FILE>" )
|
||||||
ENDIF(CMAKE_CODEBLOCKS_EXECUTABLE)
|
ENDIF(CMAKE_CODEBLOCKS_EXECUTABLE)
|
||||||
|
|
||||||
|
# Determine builtin macros and include dirs:
|
||||||
|
INCLUDE(${CMAKE_CURRENT_LIST_DIR}/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake)
|
||||||
|
|
|
||||||
|
|
@ -24,105 +24,5 @@ SET(CMAKE_ECLIPSE_MAKE_ARGUMENTS "" CACHE STRING "Additional command line argume
|
||||||
SET(ECLIPSE_CDT4_GENERATE_SOURCE_PROJECT FALSE CACHE BOOL "If enabled, CMake will generate a source project for Eclipse in CMAKE_SOURCE_DIR")
|
SET(ECLIPSE_CDT4_GENERATE_SOURCE_PROJECT FALSE CACHE BOOL "If enabled, CMake will generate a source project for Eclipse in CMAKE_SOURCE_DIR")
|
||||||
MARK_AS_ADVANCED(ECLIPSE_CDT4_GENERATE_SOURCE_PROJECT)
|
MARK_AS_ADVANCED(ECLIPSE_CDT4_GENERATE_SOURCE_PROJECT)
|
||||||
|
|
||||||
# The Eclipse generator needs to know the standard include path
|
# Determine builtin macros and include dirs:
|
||||||
# so that Eclipse ca find the headers at runtime and parsing etc. works better
|
INCLUDE(${CMAKE_CURRENT_LIST_DIR}/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake)
|
||||||
# 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 _resultIncludeDirs _resultDefines)
|
|
||||||
SET(${_resultIncludeDirs})
|
|
||||||
SET(_gccOutput)
|
|
||||||
FILE(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy" "\n" )
|
|
||||||
|
|
||||||
IF (${_lang} STREQUAL "c++")
|
|
||||||
SET(_compilerExecutable "${CMAKE_CXX_COMPILER}")
|
|
||||||
ELSE (${_lang} STREQUAL "c++")
|
|
||||||
SET(_compilerExecutable "${CMAKE_C_COMPILER}")
|
|
||||||
ENDIF (${_lang} STREQUAL "c++")
|
|
||||||
EXECUTE_PROCESS(COMMAND ${_compilerExecutable} -v -E -x ${_lang} -dD dummy
|
|
||||||
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeFiles
|
|
||||||
ERROR_VARIABLE _gccOutput
|
|
||||||
OUTPUT_VARIABLE _gccStdout )
|
|
||||||
FILE(REMOVE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy")
|
|
||||||
|
|
||||||
# First find the system include dirs:
|
|
||||||
IF( "${_gccOutput}" MATCHES "> search starts here[^\n]+\n *(.+ *\n) *End of (search) list" )
|
|
||||||
|
|
||||||
# split the output into lines and then remove leading and trailing spaces from each of them:
|
|
||||||
STRING(REGEX MATCHALL "[^\n]+\n" _includeLines "${CMAKE_MATCH_1}")
|
|
||||||
FOREACH(nextLine ${_includeLines})
|
|
||||||
STRING(STRIP "${nextLine}" _includePath)
|
|
||||||
LIST(APPEND ${_resultIncludeDirs} "${_includePath}")
|
|
||||||
ENDFOREACH(nextLine)
|
|
||||||
|
|
||||||
ENDIF( "${_gccOutput}" MATCHES "> search starts here[^\n]+\n *(.+ *\n) *End of (search) list" )
|
|
||||||
|
|
||||||
|
|
||||||
# now find the builtin macros:
|
|
||||||
STRING(REGEX MATCHALL "#define[^\n]+\n" _defineLines "${_gccStdout}")
|
|
||||||
# A few example lines which the regexp below has to match properly:
|
|
||||||
# #define MAX(a,b) ((a) > (b) ? (a) : (b))
|
|
||||||
# #define __fastcall __attribute__((__fastcall__))
|
|
||||||
# #define FOO (23)
|
|
||||||
# #define __UINTMAX_TYPE__ long long unsigned int
|
|
||||||
# #define __UINTMAX_TYPE__ long long unsigned int
|
|
||||||
# #define __i386__ 1
|
|
||||||
|
|
||||||
FOREACH(nextLine ${_defineLines})
|
|
||||||
STRING(REGEX MATCH "^#define +([A-Za-z_][A-Za-z0-9_]*)(\\([^\\)]+\\))? +(.+) *$" _dummy "${nextLine}")
|
|
||||||
SET(_name "${CMAKE_MATCH_1}${CMAKE_MATCH_2}")
|
|
||||||
STRING(STRIP "${CMAKE_MATCH_3}" _value)
|
|
||||||
#MESSAGE(STATUS "m1: -${CMAKE_MATCH_1}- m2: -${CMAKE_MATCH_2}- m3: -${CMAKE_MATCH_3}-")
|
|
||||||
|
|
||||||
LIST(APPEND ${_resultDefines} "${_name}")
|
|
||||||
IF(_value)
|
|
||||||
LIST(APPEND ${_resultDefines} "${_value}")
|
|
||||||
ELSE()
|
|
||||||
LIST(APPEND ${_resultDefines} " ")
|
|
||||||
ENDIF()
|
|
||||||
ENDFOREACH(nextLine)
|
|
||||||
|
|
||||||
ENDMACRO(_DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang)
|
|
||||||
|
|
||||||
# Save the current LC_ALL, LC_MESSAGES, and LANG environment variables and set them
|
|
||||||
# to "C" that way GCC's "search starts here" text is in English and we can grok it.
|
|
||||||
SET(_orig_lc_all $ENV{LC_ALL})
|
|
||||||
SET(_orig_lc_messages $ENV{LC_MESSAGES})
|
|
||||||
SET(_orig_lang $ENV{LANG})
|
|
||||||
IF(_orig_lc_all)
|
|
||||||
SET(ENV{LC_ALL} C)
|
|
||||||
ENDIF(_orig_lc_all)
|
|
||||||
IF(_orig_lc_messages)
|
|
||||||
SET(ENV{LC_MESSAGES} C)
|
|
||||||
ENDIF(_orig_lc_messages)
|
|
||||||
IF(_orig_lang)
|
|
||||||
SET(ENV{LANG} C)
|
|
||||||
ENDIF(_orig_lang)
|
|
||||||
|
|
||||||
# Now check for C, works for gcc and Intel compiler at least
|
|
||||||
IF (NOT CMAKE_ECLIPSE_C_SYSTEM_INCLUDE_DIRS)
|
|
||||||
IF ("${CMAKE_C_COMPILER_ID}" MATCHES GNU OR "${CMAKE_C_COMPILER_ID}" MATCHES Intel)
|
|
||||||
_DETERMINE_GCC_SYSTEM_INCLUDE_DIRS(c _dirs _defines)
|
|
||||||
SET(CMAKE_ECLIPSE_C_SYSTEM_INCLUDE_DIRS "${_dirs}" CACHE INTERNAL "C compiler system include directories")
|
|
||||||
SET(CMAKE_ECLIPSE_C_SYSTEM_DEFINED_MACROS "${_defines}" CACHE INTERNAL "C compiler system defined macros")
|
|
||||||
ENDIF ("${CMAKE_C_COMPILER_ID}" MATCHES GNU OR "${CMAKE_C_COMPILER_ID}" MATCHES Intel)
|
|
||||||
ENDIF (NOT CMAKE_ECLIPSE_C_SYSTEM_INCLUDE_DIRS)
|
|
||||||
|
|
||||||
# And now the same for C++
|
|
||||||
IF (NOT CMAKE_ECLIPSE_CXX_SYSTEM_INCLUDE_DIRS)
|
|
||||||
IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES GNU OR "${CMAKE_CXX_COMPILER_ID}" MATCHES Intel)
|
|
||||||
_DETERMINE_GCC_SYSTEM_INCLUDE_DIRS(c++ _dirs _defines)
|
|
||||||
SET(CMAKE_ECLIPSE_CXX_SYSTEM_INCLUDE_DIRS "${_dirs}" CACHE INTERNAL "CXX compiler system include directories")
|
|
||||||
SET(CMAKE_ECLIPSE_CXX_SYSTEM_DEFINED_MACROS "${_defines}" CACHE INTERNAL "CXX compiler system defined macros")
|
|
||||||
ENDIF ("${CMAKE_CXX_COMPILER_ID}" MATCHES GNU OR "${CMAKE_CXX_COMPILER_ID}" MATCHES Intel)
|
|
||||||
ENDIF (NOT CMAKE_ECLIPSE_CXX_SYSTEM_INCLUDE_DIRS)
|
|
||||||
|
|
||||||
# Restore original LC_ALL, LC_MESSAGES, and LANG
|
|
||||||
IF(_orig_lc_all)
|
|
||||||
SET(ENV{LC_ALL} ${_orig_lc_all})
|
|
||||||
ENDIF(_orig_lc_all)
|
|
||||||
IF(_orig_lc_messages)
|
|
||||||
SET(ENV{LC_MESSAGES} ${_orig_lc_messages})
|
|
||||||
ENDIF(_orig_lc_messages)
|
|
||||||
IF(_orig_lang)
|
|
||||||
SET(ENV{LANG} ${_orig_lang})
|
|
||||||
ENDIF(_orig_lang)
|
|
||||||
|
|
|
||||||
|
|
@ -590,14 +590,52 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
|
||||||
}
|
}
|
||||||
|
|
||||||
// the include directories for this target
|
// the include directories for this target
|
||||||
|
std::set<std::string> uniqIncludeDirs;
|
||||||
const std::vector<std::string>& incDirs =
|
const std::vector<std::string>& incDirs =
|
||||||
target->GetMakefile()->GetIncludeDirectories();
|
target->GetMakefile()->GetIncludeDirectories();
|
||||||
for(std::vector<std::string>::const_iterator dirIt=incDirs.begin();
|
for(std::vector<std::string>::const_iterator dirIt=incDirs.begin();
|
||||||
dirIt != incDirs.end();
|
dirIt != incDirs.end();
|
||||||
++dirIt)
|
++dirIt)
|
||||||
{
|
{
|
||||||
|
uniqIncludeDirs.insert(*dirIt);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
std::string systemIncludeDirs = makefile->GetSafeDefinition(
|
||||||
|
"CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS");
|
||||||
|
if (!systemIncludeDirs.empty())
|
||||||
|
{
|
||||||
|
std::vector<std::string> dirs;
|
||||||
|
cmSystemTools::ExpandListArgument(systemIncludeDirs.c_str(), dirs);
|
||||||
|
for(std::vector<std::string>::const_iterator dirIt=dirs.begin();
|
||||||
|
dirIt != dirs.end();
|
||||||
|
++dirIt)
|
||||||
|
{
|
||||||
|
uniqIncludeDirs.insert(*dirIt);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
systemIncludeDirs = makefile->GetSafeDefinition(
|
||||||
|
"CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_INCLUDE_DIRS");
|
||||||
|
if (!systemIncludeDirs.empty())
|
||||||
|
{
|
||||||
|
std::vector<std::string> dirs;
|
||||||
|
cmSystemTools::ExpandListArgument(systemIncludeDirs.c_str(), dirs);
|
||||||
|
for(std::vector<std::string>::const_iterator dirIt=dirs.begin();
|
||||||
|
dirIt != dirs.end();
|
||||||
|
++dirIt)
|
||||||
|
{
|
||||||
|
uniqIncludeDirs.insert(*dirIt);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for(std::set<std::string>::const_iterator dirIt=uniqIncludeDirs.begin();
|
||||||
|
dirIt != uniqIncludeDirs.end();
|
||||||
|
++dirIt)
|
||||||
|
{
|
||||||
fout <<" <Add directory=\"" << dirIt->c_str() << "\" />\n";
|
fout <<" <Add directory=\"" << dirIt->c_str() << "\" />\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
fout<<" </Compiler>\n";
|
fout<<" </Compiler>\n";
|
||||||
}
|
}
|
||||||
else // e.g. all and the GLOBAL and UTILITY targets
|
else // e.g. all and the GLOBAL and UTILITY targets
|
||||||
|
|
|
||||||
|
|
@ -654,7 +654,8 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// add system defined c macros
|
// add system defined c macros
|
||||||
const char* cDefs=mf->GetDefinition("CMAKE_ECLIPSE_C_SYSTEM_DEFINED_MACROS");
|
const char* cDefs=mf->GetDefinition(
|
||||||
|
"CMAKE_EXTRA_GENERATOR_C_SYSTEM_DEFINED_MACROS");
|
||||||
if(cDefs)
|
if(cDefs)
|
||||||
{
|
{
|
||||||
// Expand the list.
|
// Expand the list.
|
||||||
|
|
@ -689,7 +690,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
|
||||||
}
|
}
|
||||||
// add system defined c++ macros
|
// add system defined c++ macros
|
||||||
const char* cxxDefs = mf->GetDefinition(
|
const char* cxxDefs = mf->GetDefinition(
|
||||||
"CMAKE_ECLIPSE_CXX_SYSTEM_DEFINED_MACROS");
|
"CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS");
|
||||||
if(cxxDefs)
|
if(cxxDefs)
|
||||||
{
|
{
|
||||||
// Expand the list.
|
// Expand the list.
|
||||||
|
|
@ -741,7 +742,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
|
||||||
if (!compiler.empty())
|
if (!compiler.empty())
|
||||||
{
|
{
|
||||||
std::string systemIncludeDirs = mf->GetSafeDefinition(
|
std::string systemIncludeDirs = mf->GetSafeDefinition(
|
||||||
"CMAKE_ECLIPSE_C_SYSTEM_INCLUDE_DIRS");
|
"CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS");
|
||||||
std::vector<std::string> dirs;
|
std::vector<std::string> dirs;
|
||||||
cmSystemTools::ExpandListArgument(systemIncludeDirs.c_str(), dirs);
|
cmSystemTools::ExpandListArgument(systemIncludeDirs.c_str(), dirs);
|
||||||
this->AppendIncludeDirectories(fout, dirs, emmited);
|
this->AppendIncludeDirectories(fout, dirs, emmited);
|
||||||
|
|
@ -750,7 +751,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
|
||||||
if (!compiler.empty())
|
if (!compiler.empty())
|
||||||
{
|
{
|
||||||
std::string systemIncludeDirs = mf->GetSafeDefinition(
|
std::string systemIncludeDirs = mf->GetSafeDefinition(
|
||||||
"CMAKE_ECLIPSE_CXX_SYSTEM_INCLUDE_DIRS");
|
"CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_INCLUDE_DIRS");
|
||||||
std::vector<std::string> dirs;
|
std::vector<std::string> dirs;
|
||||||
cmSystemTools::ExpandListArgument(systemIncludeDirs.c_str(), dirs);
|
cmSystemTools::ExpandListArgument(systemIncludeDirs.c_str(), dirs);
|
||||||
this->AppendIncludeDirectories(fout, dirs, emmited);
|
this->AppendIncludeDirectories(fout, dirs, emmited);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue