calendaring/php calendaring/python icalendar/php icalendar/python

Christian Mollekopf mollekopf at kolabsys.com
Tue Jul 31 14:35:06 CEST 2012


 calendaring/php/CMakeLists.txt    |    2 +-
 calendaring/python/CMakeLists.txt |    8 ++++----
 icalendar/php/CMakeLists.txt      |    2 +-
 icalendar/python/CMakeLists.txt   |    8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 84cd87c36e63101596cbc514357206dbf3077bc5
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Tue Jul 31 14:34:58 2012 +0200

    prefixed module names with kolab to avoid name clashes.

diff --git a/calendaring/php/CMakeLists.txt b/calendaring/php/CMakeLists.txt
index 0644c13..72b8333 100644
--- a/calendaring/php/CMakeLists.txt
+++ b/calendaring/php/CMakeLists.txt
@@ -28,7 +28,7 @@ if (PHP4_FOUND)
     include_directories(${PHP4_INCLUDE_PATH})
     add_library(calendaring_phpbindings SHARED ${KOLAB_SWIG_PHP_SOURCE_FILE})
     target_link_libraries(calendaring_phpbindings kolab)
-    SET_TARGET_PROPERTIES(calendaring_phpbindings PROPERTIES OUTPUT_NAME "calendaring")
+    SET_TARGET_PROPERTIES(calendaring_phpbindings PROPERTIES OUTPUT_NAME "kolab-calendaring")
     SET_TARGET_PROPERTIES(calendaring_phpbindings PROPERTIES PREFIX "")
 
 #     configure_file(test.php ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
diff --git a/calendaring/python/CMakeLists.txt b/calendaring/python/CMakeLists.txt
index 9891fa9..5ffb68f 100644
--- a/calendaring/python/CMakeLists.txt
+++ b/calendaring/python/CMakeLists.txt
@@ -28,17 +28,17 @@ 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(calendaring ${KOLAB_SWIG_PYTHON_SOURCE_FILE})
+python_add_module(kolab-calendaring ${KOLAB_SWIG_PYTHON_SOURCE_FILE})
 
 #cmake 2.6.4 fails to respect the module prefix
-SET_TARGET_PROPERTIES(calendaring PROPERTIES PREFIX "${PYTHON_MODULE_PREFIX}")
+SET_TARGET_PROPERTIES(kolab-calendaring PROPERTIES PREFIX "${PYTHON_MODULE_PREFIX}")
 
-target_link_libraries(calendaring kolab ${PYTHON_LIBRARIES})
+target_link_libraries(kolab-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 calendaring LIBRARY DESTINATION ${PYTHON_INSTALL_DIR})
+install(TARGETS kolab-calendaring LIBRARY DESTINATION ${PYTHON_INSTALL_DIR})
 
 install( FILES
         ${KOLAB_SWIG_PYTHON_HEADER_FILE}
diff --git a/icalendar/php/CMakeLists.txt b/icalendar/php/CMakeLists.txt
index fcdb5da..a9a94c8 100644
--- a/icalendar/php/CMakeLists.txt
+++ b/icalendar/php/CMakeLists.txt
@@ -28,7 +28,7 @@ if (PHP4_FOUND)
     include_directories(${PHP4_INCLUDE_PATH})
     add_library(icalendar_phpbindings SHARED ${KOLAB_SWIG_PHP_SOURCE_FILE})
     target_link_libraries(icalendar_phpbindings kolab ${PHP_LIBRARIES})
-    SET_TARGET_PROPERTIES(icalendar_phpbindings PROPERTIES OUTPUT_NAME "icalendar")
+    SET_TARGET_PROPERTIES(icalendar_phpbindings PROPERTIES OUTPUT_NAME "kolab-icalendar")
     SET_TARGET_PROPERTIES(icalendar_phpbindings PROPERTIES PREFIX "")
 
 #     configure_file(test.php ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
diff --git a/icalendar/python/CMakeLists.txt b/icalendar/python/CMakeLists.txt
index a2bd011..6244a82 100644
--- a/icalendar/python/CMakeLists.txt
+++ b/icalendar/python/CMakeLists.txt
@@ -28,16 +28,16 @@ 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(icalendar ${KOLAB_SWIG_PYTHON_SOURCE_FILE})
+python_add_module(kolab-icalendar ${KOLAB_SWIG_PYTHON_SOURCE_FILE})
 
 #cmake 2.6.4 fails to respect the module prefix
-SET_TARGET_PROPERTIES(icalendar PROPERTIES PREFIX "${PYTHON_MODULE_PREFIX}")
+SET_TARGET_PROPERTIES(kolab-icalendar PROPERTIES PREFIX "${PYTHON_MODULE_PREFIX}")
 
-target_link_libraries(icalendar kolab ${PYTHON_LIBRARIES})
+target_link_libraries(kolab-icalendar kolab ${PYTHON_LIBRARIES})
 
 set(PYTHON_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/pythonbindings" CACHE STRING "Install directory for python bindings.")
 
-install(TARGETS icalendar LIBRARY DESTINATION ${PYTHON_INSTALL_DIR})
+install(TARGETS kolab-icalendar LIBRARY DESTINATION ${PYTHON_INSTALL_DIR})
 
 install( FILES
         ${KOLAB_SWIG_PYTHON_HEADER_FILE}





More information about the commits mailing list