KDE/kdelibs/cmake/modules

[Michael Jansen]

SVN commit 1068561 by mjansen:

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 at kde.org
CCMAIL: kde-bindings at kde.org

 M  +3 -1      FindSIP.cmake  


--- trunk/KDE/kdelibs/cmake/modules/FindSIP.cmake #1068560:1068561
@@ -38,7 +38,9 @@
     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)