diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-02-07 20:16:28 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-02-07 20:16:28 +0000 |
| commit | c11fc5de759fa645e301e50fbb4e794c80d1a117 (patch) | |
| tree | d4ad33a4194ba20240cbde4304f1f7bf2d45a8c4 /modules/MacroOptionalFindPackage.cmake | |
| parent | b47c577aba55d74f60cc4ac0ac5ea42b333dc615 (diff) | |
| download | extra-cmake-modules-c11fc5de759fa645e301e50fbb4e794c80d1a117.tar.gz extra-cmake-modules-c11fc5de759fa645e301e50fbb4e794c80d1a117.tar.bz2 | |
-move the find_package(PCRE) from kdelibs/CMakeLists.txt to kdelibs/kjs/CMakeLists.txt
-add a check for regex.h in kjs/CMakeLists.txt and error out if neither PCRE nor regex.h have been found
build kdelibs/win independent from the rest of kdelibs/
this means
1) run cmake on kdelibs/win/
2) make kdelibs/win
3) install kdelibs/win
4) run cmake in kdelibs/ -> point it to the place where kdewin32 has been installed to
5) make kdelibs/
6) make install
Peter, can you please check that kdelibs/win/ builds and also installs this way ?
It might still be possible that somewhere stuff from kdelibs/ is included directly.
Also eventually $ENV{MSSDK}/include might have to be added in kdelibs/win/
ConfigureChecksWin.cmake is not used anymore, we can remove it if it works this way.
Please check also that kdelibs/ configures correctly again. It is required that the include dir
of kdewin32 is set.
If all the HAVE_FOO_PROTO checks still fail, please post the error messages from CMakeError.log
Alex
CCMAIL: kde-buildsystem@kde.org
CCMAIL: syntheticpp@gmx.net
CCMAIL: bill.hoffman@kitware.com
svn path=/trunk/KDE/kdelibs/; revision=506872
Diffstat (limited to 'modules/MacroOptionalFindPackage.cmake')
| -rw-r--r-- | modules/MacroOptionalFindPackage.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/modules/MacroOptionalFindPackage.cmake b/modules/MacroOptionalFindPackage.cmake index 4ad64a41..1b0cf1e7 100644 --- a/modules/MacroOptionalFindPackage.cmake +++ b/modules/MacroOptionalFindPackage.cmake @@ -11,6 +11,12 @@ MACRO(MACRO_OPTIONAL_FIND_PACKAGE _name ) OPTION(WITH_${_name} "Search for ${_name} package" ON) IF (WITH_${_name}) FIND_PACKAGE(${_name} ${ARGN}) + ELSE (WITH_${_name}) + SET(${_name}_FOUND) + SET(${_name}_INCLUDE_DIR) + SET(${_name}_INCLUDES) + SET(${_name}_LIBRARY) + SET(${_name}_LIBRARIES) ENDIF (WITH_${_name}) ENDMACRO(MACRO_OPTIONAL_FIND_PACKAGE) |