[Kde-bindings] KDE/kdebindings/python/pykde4

Michael Jansen kde at michael-jansen.biz
Fri Aug 13 17:14:47 UTC 2010


SVN commit 1163308 by mjansen:

PYTHON_SITE_PACKAGES_DIR -> PYTHON_SITE_PACKAGES_INSTALL_DIR

See FindPythonLibrary.cmake for the difference.

CCMAIL: kde-bindings at kde.org

 M  +4 -4      CMakeLists.txt  
 M  +3 -3      tools/pykdeuic4/CMakeLists.txt  


--- trunk/KDE/kdebindings/python/pykde4/CMakeLists.txt #1163307:1163308
@@ -188,12 +188,12 @@
     SET(PYKDE_MODULES "${PYKDE_MODULES} polkitqt")
 ENDIF(POLKITQT_FOUND)
 
-PYTHON_INSTALL(__init__.py ${PYTHON_SITE_PACKAGES_DIR}/PyKDE4)
+PYTHON_INSTALL(__init__.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4)
 
 MESSAGE(STATUS "KDE_VERSION: ${KDE_VERSION}")
 MESSAGE(STATUS "KDE4_INCLUDE_DIR: ${KDE4_INCLUDE_DIR}")
 MESSAGE(STATUS "KDE4_LIB_DIR: ${KDE4_LIB_DIR}")
-MESSAGE(STATUS "PYTHON_SITE_PACKAGES_DIR: ${PYTHON_SITE_PACKAGES_DIR}")
+MESSAGE(STATUS "PYTHON_SITE_PACKAGES_INSTALL_DIR: ${PYTHON_SITE_PACKAGES_INSTALL_DIR}")
 
 # Setup and install pykdeconfig.py
 
@@ -225,7 +225,7 @@
     'konsolepart':          'False',
     'libdir':               '${LIB_DIR}',
     'pykde_kde_sip_flags':  '${_SIP_TAGS} ${_SIP_X} ${SIP_EXTRA_OPTIONS}',
-    'pykde_mod_dir':        '${PYTHON_SITE_PACKAGES_DIR}/PyKDE4',
+    'pykde_mod_dir':        '${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4',
     'pykde_modules':        '${PYKDE_MODULES}',
     'pykde_sip_dir':        '${SIP_DEFAULT_SIP_DIR}/PyKDE4',
     'pykde_version':        kde_version_hex,
@@ -235,7 +235,7 @@
 _default_macros = None")
 
 CONFIGURE_FILE(pykdeconfig.py.in ${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py)
-PYTHON_INSTALL(${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py ${PYTHON_SITE_PACKAGES_DIR}/PyKDE4)
+PYTHON_INSTALL(${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4)
 
 # Install the .sip files for anyone that wants to build bindings on top of PyKDE4.
 # (Don't forget the / at the end of sip/.)
--- trunk/KDE/kdebindings/python/pykde4/tools/pykdeuic4/CMakeLists.txt #1163307:1163308
@@ -1,5 +1,5 @@
 
-PYTHON_INSTALL(kde4.py ${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/widget-plugins/)
-PYTHON_INSTALL(pykdeuic4.py ${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/)
+PYTHON_INSTALL(kde4.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/widget-plugins/)
+PYTHON_INSTALL(pykdeuic4.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/)
 find_path(cmake_module_dir create_exe_symlink.cmake ${CMAKE_MODULE_PATH})
-INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/pykdeuic4.py -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" )
+INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/pykdeuic4.py -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" )



More information about the Kde-bindings mailing list