ea07ce2172
- Add xxxx-fix-python-mapscript-soversion-install-issue.patch to fix broken installing of mapscript python module - Exclude ruby from build for sles11 because of missing ruby dependencies - Use ruby-common as build dependency instead of outdated ruby-macros OBS-URL: https://build.opensuse.org/request/show/368007 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/mapserver?expand=0&rev=101
24 lines
1.4 KiB
Diff
24 lines
1.4 KiB
Diff
--- a/mapscript/python/CMakeLists.txt 2016-01-08 12:54:36.040215116 +0000
|
|
+++ b/mapscript/python/CMakeLists.txt 2016-01-08 12:58:24.534402782 +0000
|
|
@@ -46,9 +46,5 @@
|
|
|
|
execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True)" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
|
|
-get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_pythonmapscript_REAL_NAME} LOCATION)
|
|
-set(mapscript_files ${LOC_MAPSCRIPT_LIB} ${CMAKE_CURRENT_BINARY_DIR}/mapscript.py)
|
|
-install(FILES ${mapscript_files} DESTINATION ${PYTHON_SITE_PACKAGES})
|
|
-
|
|
-#install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mapscript.py DESTINATION ${PYTHON_SITE_PACKAGES})
|
|
-#install(TARGETS mapscript DESTINATION ${PYTHON_SITE_PACKAGES})
|
|
+install(TARGETS ${SWIG_MODULE_pythonmapscript_REAL_NAME} DESTINATION ${PYTHON_SITE_PACKAGES})
|
|
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mapscript.py DESTINATION ${PYTHON_SITE_PACKAGES})
|
|
--- a/mapscript/php/CMakeLists.txt 2016-01-08 12:58:37.234524377 +0000
|
|
+++ b/mapscript/php/CMakeLists.txt 2016-01-08 12:58:49.634643100 +0000
|
|
@@ -36,6 +36,3 @@
|
|
|
|
set_target_properties(php_mapscript PROPERTIES PREFIX "")
|
|
install(TARGETS php_mapscript DESTINATION ${PHP5_EXTENSION_DIR})
|
|
-
|
|
-#install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mapscript.py DESTINATION ${PYTHON_SITE_PACKAGES})
|
|
-#install(TARGETS mapscript DESTINATION ${PYTHON_SITE_PACKAGES})
|