summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Jonathan Beck2009-10-16 22:29:49 +0200
committerGravatar Jonathan Beck2009-10-16 22:29:49 +0200
commit7ba9a5437e49868ca7a7cc2f4d006509308b1ab4 (patch)
treea4223162b635be801eac1f26b5f9de38cabd3c51
parent32be8ec384bfd78e189d3de6609e50cf4dd072a2 (diff)
downloadlibplist-7ba9a5437e49868ca7a7cc2f4d006509308b1ab4.tar.gz
libplist-7ba9a5437e49868ca7a7cc2f4d006509308b1ab4.tar.bz2
Fix python binding install path.
-rw-r--r--CMakeLists.txt6
-rw-r--r--swig/CMakeLists.txt11
2 files changed, 12 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 07946ea..116bf73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,6 +18,7 @@ ENDIF(NOT DEFINED CMAKE_INSTALL_LIBDIR)
18FIND_PACKAGE( LibXml2 REQUIRED ) 18FIND_PACKAGE( LibXml2 REQUIRED )
19FIND_PACKAGE( GLIB2 REQUIRED ) 19FIND_PACKAGE( GLIB2 REQUIRED )
20FIND_PACKAGE( SWIG ) 20FIND_PACKAGE( SWIG )
21FIND_PACKAGE( PythonInterp )
21FIND_PACKAGE( PythonLibs ) 22FIND_PACKAGE( PythonLibs )
22 23
23INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}/include" ) 24INCLUDE_DIRECTORIES( "${CMAKE_CURRENT_SOURCE_DIR}/include" )
@@ -29,9 +30,9 @@ ADD_SUBDIRECTORY( plutil )
29ADD_SUBDIRECTORY( include ) 30ADD_SUBDIRECTORY( include )
30ADD_SUBDIRECTORY( test ) 31ADD_SUBDIRECTORY( test )
31 32
32IF ( SWIG_FOUND AND PYTHON_LIBRARY ) 33IF ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND )
33 ADD_SUBDIRECTORY( swig ) 34 ADD_SUBDIRECTORY( swig )
34ENDIF ( SWIG_FOUND AND PYTHON_LIBRARY ) 35ENDIF ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND )
35 36
36# add uninstall target 37# add uninstall target
37CONFIGURE_FILE( "${CMAKE_SOURCE_DIR}/cmake/modules/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY) 38CONFIGURE_FILE( "${CMAKE_SOURCE_DIR}/cmake/modules/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
@@ -39,6 +40,7 @@ ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/c
39 40
40########## PkgConfig ############################ 41########## PkgConfig ############################
41CONFIGURE_FILE( "libplist.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libplist.pc" ) 42CONFIGURE_FILE( "libplist.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libplist.pc" )
43
42########## INSTALL ############################## 44########## INSTALL ##############################
43INSTALL( FILES "${CMAKE_CURRENT_BINARY_DIR}/libplist.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/ ) 45INSTALL( FILES "${CMAKE_CURRENT_BINARY_DIR}/libplist.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/ )
44 46
diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt
index a139859..f79b3dc 100644
--- a/swig/CMakeLists.txt
+++ b/swig/CMakeLists.txt
@@ -7,12 +7,17 @@ INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_PATH} )
7SWIG_ADD_MODULE( PList python plist.i ) 7SWIG_ADD_MODULE( PList python plist.i )
8SWIG_LINK_LIBRARIES( PList plist ${PYTHON_LIBRARIES} ) 8SWIG_LINK_LIBRARIES( PList plist ${PYTHON_LIBRARIES} )
9 9
10EXEC_PROGRAM("${PYTHON_EXECUTABLE}"
11 ARGS "-c 'try:\n import distutils.sysconfig; print distutils.sysconfig.get_python_lib()\nexcept: pass\n'"
12 OUTPUT_VARIABLE DISTUTILS_PYTHON_ILIBRARY_PATH
13 )
14
10INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/_PList${CMAKE_SHARED_MODULE_SUFFIX} 15INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/_PList${CMAKE_SHARED_MODULE_SUFFIX}
11 DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/site-packages/libplist/ ) 16 DESTINATION ${DISTUTILS_PYTHON_ILIBRARY_PATH}/libplist/ )
12INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/PList.py 17INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/PList.py
13 DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/site-packages/libplist/ ) 18 DESTINATION ${DISTUTILS_PYTHON_ILIBRARY_PATH}/libplist/ )
14INSTALL( FILES ${CMAKE_CURRENT_SOURCE_DIR}/__init__.py 19INSTALL( FILES ${CMAKE_CURRENT_SOURCE_DIR}/__init__.py
15 DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/site-packages/libplist/ ) 20 DESTINATION ${DISTUTILS_PYTHON_ILIBRARY_PATH}/libplist/ )
16INSTALL( FILES ${CMAKE_CURRENT_SOURCE_DIR}/plist.i 21INSTALL( FILES ${CMAKE_CURRENT_SOURCE_DIR}/plist.i
17 DESTINATION include/plist/swig COMPONENT dev) 22 DESTINATION include/plist/swig COMPONENT dev)
18 23