diff options
| author | Michael Jansen <kde@michael-jansen.biz> | 2010-01-01 14:46:45 +0000 |
|---|---|---|
| committer | Michael Jansen <kde@michael-jansen.biz> | 2010-01-01 14:46:45 +0000 |
| commit | b0f30d9bad00a75d726395c217b1c8a32528c46b (patch) | |
| tree | 93fda78c86e6b83d1cfaff8a28859fbddccdb70e | |
| parent | 1b03544444fb469a8726b846f23db408c6da6549 (diff) | |
| download | extra-cmake-modules-b0f30d9bad00a75d726395c217b1c8a32528c46b.tar.gz extra-cmake-modules-b0f30d9bad00a75d726395c217b1c8a32528c46b.tar.bz2 | |
Make it possible to override SIP_DEFAULT_DIR from the commandline. This
makes it possible to install the sip files into the same prefix like the
rest of kdelibs.
Perhaps it would be a got idea to respect PYTHON_LIBS_WITH_KDE (from
FindPythonLibrary.cmake) here? But I'm not sure.
CCMAIL: kde-buildsystem@kde.org
CCMAIL: kde-bindings@kde.org
svn path=/trunk/KDE/kdelibs/; revision=1068561
| -rw-r--r-- | modules/FindSIP.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/FindSIP.cmake b/modules/FindSIP.cmake index 01f3bd16..53e28881 100644 --- a/modules/FindSIP.cmake +++ b/modules/FindSIP.cmake @@ -38,7 +38,9 @@ ELSE(SIP_VERSION) STRING(REGEX REPLACE "^sip_version:([^\n]+).*$" "\\1" SIP_VERSION ${sip_config}) STRING(REGEX REPLACE ".*\nsip_version_str:([^\n]+).*$" "\\1" SIP_VERSION_STR ${sip_config}) STRING(REGEX REPLACE ".*\nsip_bin:([^\n]+).*$" "\\1" SIP_EXECUTABLE ${sip_config}) - STRING(REGEX REPLACE ".*\ndefault_sip_dir:([^\n]+).*$" "\\1" SIP_DEFAULT_SIP_DIR ${sip_config}) + IF(NOT SIP_DEFAULT_SIP_DIR) + STRING(REGEX REPLACE ".*\ndefault_sip_dir:([^\n]+).*$" "\\1" SIP_DEFAULT_SIP_DIR ${sip_config}) + ENDIF(NOT SIP_DEFAULT_SIP_DIR) STRING(REGEX REPLACE ".*\nsip_inc_dir:([^\n]+).*$" "\\1" SIP_INCLUDE_DIR ${sip_config}) SET(SIP_FOUND TRUE) ENDIF(sip_config) |