diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-02-04 12:15:29 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-02-04 12:15:29 +0000 |
| commit | fb0d05a8363b1f37c24f995b9565cb90c8625256 (patch) | |
| tree | f1cadba99909fb7577f86cc0e860a378b4a6a17d /modules/CheckIncludeFiles.cmake | |
| parent | 817117aaa55be6d5c8ef3867630c9a9545da5520 (diff) | |
| download | extra-cmake-modules-fb0d05a8363b1f37c24f995b9565cb90c8625256.tar.gz extra-cmake-modules-fb0d05a8363b1f37c24f995b9565cb90c8625256.tar.bz2 | |
-renamed optional_find_package() to macro_optional_find_package(), to make it clear it is a macro and not a builtin command
-kjsembed compiles
-CheckCXXSourceCompiles now support multiple include paths
-compile fix in kjsembed/value_binding.cpp: prefer the local global.h, otherwise it might end up with the global.h from kio/kio/, depending on the order of include directories
-use the new "-o" switch for dcopidl
-add a (temporary) workaround for David's uic problem
Alex
svn path=/trunk/KDE/kdelibs/; revision=505580
The following changes were in SVN, but were removed from git:
M pics/CMakeLists.txt
Diffstat (limited to 'modules/CheckIncludeFiles.cmake')
| -rw-r--r-- | modules/CheckIncludeFiles.cmake | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/modules/CheckIncludeFiles.cmake b/modules/CheckIncludeFiles.cmake index 8d1b0fb3..016402af 100644 --- a/modules/CheckIncludeFiles.cmake +++ b/modules/CheckIncludeFiles.cmake @@ -12,18 +12,10 @@ MACRO(CHECK_INCLUDE_FILES INCLUDE VARIABLE) IF("${VARIABLE}" MATCHES "^${VARIABLE}$") - SET(CHECK_INCLUDE_FILES_INCLUDE_DIRS ) -# IF(CMAKE_REQUIRED_INCLUDES) -# SET(CHECK_INCLUDE_FILES_INCLUDE_DIRS -# "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}") -# ENDIF(CMAKE_REQUIRED_INCLUDES) - SET(CHECK_INCLUDE_FILES_INCLUDE_DIRS -DINCLUDE_DIRECTORIES=) - FOREACH(_inc_DIR ${CMAKE_REQUIRED_INCLUDES}) - SET(CHECK_INCLUDE_FILES_INCLUDE_DIRS "${CHECK_INCLUDE_FILES_INCLUDE_DIRS}${_inc_DIR}\;") - ENDFOREACH(_inc_DIR ${CMAKE_REQUIRED_INCLUDES}) - SET(CHECK_INCLUDE_FILES_INCLUDE_DIRS "${CHECK_INCLUDE_FILES_INCLUDE_DIRS} ") - + SET(CHECK_INCLUDE_FILES_INCLUDE_DIRS "-DINCLUDE_DIRECTORIES=${CMAKE_REQUIRED_INCLUDES}") + STRING(REGEX REPLACE ";" "\\\\;" CHECK_INCLUDE_FILES_INCLUDE_DIRS "${CHECK_INCLUDE_FILES_INCLUDE_DIRS}") + SET(CHECK_INCLUDE_FILES_CONTENT "/* */\n") SET(MACRO_CHECK_INCLUDE_FILES_FLAGS ${CMAKE_REQUIRED_FLAGS}) FOREACH(FILE ${INCLUDE}) |