calendaring/python icalendar/python

[Jeroen van Meeuwen]

 calendaring/python/CMakeLists.txt |   12 ++++++------
 icalendar/python/CMakeLists.txt   |   12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 70420683675ac75863d8a3f3e1dc01096d354c66
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Aug 2 11:07:36 2012 +0100

    Make Python modules install into a kolab sub-directory of PYTHON_INSTALL_DIR as to avoid name conflicts with other modules (#900)

diff --git a/calendaring/python/CMakeLists.txt b/calendaring/python/CMakeLists.txt
index 5ffb68f..f351ba2 100644
--- a/calendaring/python/CMakeLists.txt
+++ b/calendaring/python/CMakeLists.txt
@@ -28,19 +28,19 @@ SET_SOURCE_FILES_PROPERTIES(${KOLAB_SWIG_PYTHON_SOURCE_FILE} PROPERTIES GENERATE
 include_directories(${PYTHON_INCLUDE_DIRS} ${PYTHON_INCLUDE_PATH})
 
 set(PYTHON_MODULE_PREFIX "_")
-python_add_module(kolab-calendaring ${KOLAB_SWIG_PYTHON_SOURCE_FILE})
+python_add_module(calendaring ${KOLAB_SWIG_PYTHON_SOURCE_FILE})
 
 #cmake 2.6.4 fails to respect the module prefix
-SET_TARGET_PROPERTIES(kolab-calendaring PROPERTIES PREFIX "${PYTHON_MODULE_PREFIX}")
+SET_TARGET_PROPERTIES(calendaring PROPERTIES PREFIX "${PYTHON_MODULE_PREFIX}")
 
-target_link_libraries(kolab-calendaring kolab ${PYTHON_LIBRARIES})
+target_link_libraries(calendaring kolab ${PYTHON_LIBRARIES})
 # configure_file(test.py ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
 
 set(PYTHON_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/pythonbindings" CACHE STRING "Install directory for python bindings.")
 
-install(TARGETS kolab-calendaring LIBRARY DESTINATION ${PYTHON_INSTALL_DIR})
+install(TARGETS calendaring LIBRARY DESTINATION ${PYTHON_INSTALL_DIR}/kolab)
 
 install( FILES
         ${KOLAB_SWIG_PYTHON_HEADER_FILE}
-        DESTINATION ${PYTHON_INSTALL_DIR}
-    )
\ No newline at end of file
+        DESTINATION ${PYTHON_INSTALL_DIR}/kolab
+    )
diff --git a/icalendar/python/CMakeLists.txt b/icalendar/python/CMakeLists.txt
index 6244a82..e406c5c 100644
--- a/icalendar/python/CMakeLists.txt
+++ b/icalendar/python/CMakeLists.txt
@@ -28,19 +28,19 @@ SET_SOURCE_FILES_PROPERTIES(${KOLAB_SWIG_PYTHON_SOURCE_FILE} PROPERTIES GENERATE
 include_directories(${PYTHON_INCLUDE_DIRS} ${PYTHON_INCLUDE_PATH})
 
 set(PYTHON_MODULE_PREFIX "_")
-python_add_module(kolab-icalendar ${KOLAB_SWIG_PYTHON_SOURCE_FILE})
+python_add_module(icalendar ${KOLAB_SWIG_PYTHON_SOURCE_FILE})
 
 #cmake 2.6.4 fails to respect the module prefix
-SET_TARGET_PROPERTIES(kolab-icalendar PROPERTIES PREFIX "${PYTHON_MODULE_PREFIX}")
+SET_TARGET_PROPERTIES(icalendar PROPERTIES PREFIX "${PYTHON_MODULE_PREFIX}")
 
-target_link_libraries(kolab-icalendar kolab ${PYTHON_LIBRARIES})
+target_link_libraries(icalendar kolab ${PYTHON_LIBRARIES})
 
 set(PYTHON_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/pythonbindings" CACHE STRING "Install directory for python bindings.")
 
-install(TARGETS kolab-icalendar LIBRARY DESTINATION ${PYTHON_INSTALL_DIR})
+install(TARGETS icalendar LIBRARY DESTINATION ${PYTHON_INSTALL_DIR}/kolab)
 
 install( FILES
         ${KOLAB_SWIG_PYTHON_HEADER_FILE}
-        DESTINATION ${PYTHON_INSTALL_DIR}
+        DESTINATION ${PYTHON_INSTALL_DIR}/kolab
     )
-    
\ No newline at end of file
+