casa-mp-base

diff -ur ../pykde4-4.14.3-orig/CMakeLists.txt ./CMakeLists.txt

--- ../pykde4-4.14.3-orig/CMakeLists.txt    2015-04-28 01:25:43.000000000 +0900

+++ ./CMakeLists.txt    2015-04-28 01:07:08.000000000 +0900

@@ -8,7 +8,6 @@

 # Match what's used in the main macros

 cmake_policy(SET CMP0002 OLD)

 find_package(PythonLibrary)

-find_package(PythonLibs)

 include(KDE4Defaults)

 include(MacroLibrary)

@@ -34,8 +33,6 @@

 include_directories(${KDE4_INCLUDES})

-add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT3_SUPPORT)

-

 find_package(SIP)

 set_package_properties(SIP PROPERTIES DESCRIPTION "The SIP binding generator"

                        URL "http://riverbankcomputing.com" TYPE REQUIRED

@@ -78,7 +75,6 @@

                        "Required to build Python Polkit bindings")

 include_directories(

-    ${PYTHON_INCLUDE_DIRS}

     ${PYTHON_INCLUDE_PATH}

     ${SIP_INCLUDE_DIR}

     ${QT_INCLUDE_DIR}

@@ -103,17 +99,18 @@

     ${KDEPIMLIBS_INCLUDE_DIRS}

 )

-# Pull in ARM configuration options if needed

-STRING(REGEX MATCH "PyQt_qreal_double" SIP_ARM_HACK ${PYQT4_SIP_FLAGS} "")

-

 set(SIP_INCLUDES ${CMAKE_BINARY_DIR} ${PYQT4_SIP_DIR} sip)

 set(SIP_CONCAT_PARTS 8)

 if (WIN32)

     set(SIP_TAGS ALL WS_WIN ${PYQT4_VERSION_TAG})

 else ()

-    set(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})

-endif ()

-set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug ${SIP_ARM_HACK})

+    if (APPLE)

+        set(SIP_TAGS ALL WS_MACX ${PYQT4_VERSION_TAG})

+    else ()

+        set(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})

+    endif (APPLE)

+endif (WIN32)

+set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug)

 set(SIP_FILES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/sip)

@@ -259,23 +256,16 @@

 # Install the .sip files for anyone that wants to build bindings on top of PyKDE4.

 # (Don't forget the / at the end of sip/.)

 install(FILES ${CMAKE_BINARY_DIR}/pykde_config.sip DESTINATION ${SIP_FILES_INSTALL_DIR}/PyKDE4/)

-if(DEFAULT_PYTHON_VERSION)

-  install(DIRECTORY sip/ DESTINATION ${SIP_FILES_INSTALL_DIR}/PyKDE4

-        PATTERN "*~" EXCLUDE    # This sucks, why can't I just whitelist what I _do_ want?

-        PATTERN ".svn" EXCLUDE

-        PATTERN "*.in" EXCLUDE)

-   message("Installing sip files in this build pass")