2007-07-05 19:33:46 +02:00
|
|
|
diff -ruN qgis-0.8.1-orig/CMakeLists.txt qgis-0.8.1/CMakeLists.txt
|
|
|
|
|
--- qgis-0.8.1-orig/CMakeLists.txt 2007-02-23 12:20:33.000000000 -0500
|
|
|
|
|
+++ qgis-0.8.1/CMakeLists.txt 2007-07-05 13:32:55.000000000 -0400
|
|
|
|
|
@@ -140,7 +140,7 @@
|
|
|
|
|
# common for MAC and UNIX
|
|
|
|
|
SET (QGIS_BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin)
|
|
|
|
|
SET (QGIS_DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/qgis)
|
|
|
|
|
- SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib/qgis)
|
|
|
|
|
+ SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/qgis)
|
|
|
|
|
SET (QGIS_SOURCE_DIR ${CMAKE_SOURCE_DIR})
|
|
|
|
|
SET (QGIS_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include/qgis")
|
|
|
|
|
|
2007-07-05 17:14:21 +02:00
|
|
|
diff -ruN qgis-0.8.1-orig/settings.pro qgis-0.8.1/settings.pro
|
|
|
|
|
--- qgis-0.8.1-orig/settings.pro 2007-01-01 23:31:27.000000000 -0500
|
2007-07-05 19:33:46 +02:00
|
|
|
+++ qgis-0.8.1/settings.pro 2007-07-05 13:33:16.000000000 -0400
|
2007-07-05 17:14:21 +02:00
|
|
|
@@ -107,14 +107,14 @@
|
|
|
|
|
win32:QGISBINDIR=$${DESTDIR}
|
|
|
|
|
macx:QGISBINDIR=$${DESTDIR}/$${QGIS_APP_NAME}.app/Contents/MacOS/
|
|
|
|
|
|
|
|
|
|
-linux-g++:QGISLIBDIR=$${DESTDIR}/lib
|
2007-07-05 17:46:04 +02:00
|
|
|
+linux-g++:QGISLIBDIR=$${DESTDIR}/lib$${LIB_SUFFIX}
|
2007-07-05 17:14:21 +02:00
|
|
|
macx:QGISLIBDIR=$${QGISBINDIR}
|
|
|
|
|
win32:QGISLIBDIR=$${DESTDIR}
|
|
|
|
|
|
|
|
|
|
-QGISPLUGINDIR=$${DESTDIR}/lib/qgis
|
2007-07-05 17:46:04 +02:00
|
|
|
+QGISPLUGINDIR=$${DESTDIR}/lib$${LIB_SUFFIX}/qgis
|
2007-07-05 17:14:21 +02:00
|
|
|
macx:QGISPLUGINDIR=$${DESTDIR}/$${QGIS_APP_NAME}.app/Contents/lib/qgis
|
|
|
|
|
|
|
|
|
|
-QGISPROVIDERDIR=$${QGISBINDIR}/lib/qgis
|
2007-07-05 17:46:04 +02:00
|
|
|
+QGISPROVIDERDIR=$${QGISBINDIR}/lib$${LIB_SUFFIX}/qgis
|
2007-07-05 17:14:21 +02:00
|
|
|
macx:QGISPROVIDERDIR=$${DESTDIR}/$${QGIS_APP_NAME}.app/Contents/lib/qgis
|
|
|
|
|
|
|
|
|
|
win32:QGISDOCDIR=$${DESTDIR}/share/qgis/doc
|
|
|
|
|
@@ -186,7 +186,7 @@
|
|
|
|
|
win32:LIBS+=-LC:\msys\local\lib
|
|
|
|
|
win32:LIBS+=-L$${DESTDIR}
|
|
|
|
|
win32:LIBS+=-L$${DESTDIR}/lib/qgis
|
|
|
|
|
-linux-g++:LIBS+=-L$${DESTDIR}/lib
|
2007-07-05 17:46:04 +02:00
|
|
|
+linux-g++:LIBS+=-L$${DESTDIR}/lib$${LIB_SUFFIX}
|
2007-07-05 17:14:21 +02:00
|
|
|
linux-g++:LIBS+=-L/usr/lib/ccache/lib
|
|
|
|
|
macx:LIBS+=-L$${QGISLIBDIR}
|
|
|
|
|
macx:LIBS+=-F/Library/Frameworks/
|
2007-07-05 20:20:32 +02:00
|
|
|
diff -ruN qgis-0.8.1-orig/src/core/CMakeLists.txt qgis-0.8.1/src/core/CMakeLists.txt
|
|
|
|
|
--- qgis-0.8.1-orig/src/core/CMakeLists.txt 2007-04-18 13:46:21.000000000 -0400
|
|
|
|
|
+++ qgis-0.8.1/src/core/CMakeLists.txt 2007-07-05 14:18:50.000000000 -0400
|
|
|
|
|
@@ -304,7 +304,7 @@
|
|
|
|
|
|
|
|
|
|
INSTALL(TARGETS qgis_core
|
|
|
|
|
RUNTIME DESTINATION ${QGIS_BIN_DIR}
|
|
|
|
|
- LIBRARY DESTINATION lib)
|
|
|
|
|
+ LIBRARY DESTINATION lib${LIB_SUFFIX})
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff -ruN qgis-0.8.1-orig/src/providers/grass/CMakeLists.txt qgis-0.8.1/src/providers/grass/CMakeLists.txt
|
|
|
|
|
--- qgis-0.8.1-orig/src/providers/grass/CMakeLists.txt 2007-02-12 17:56:43.000000000 -0500
|
|
|
|
|
+++ qgis-0.8.1/src/providers/grass/CMakeLists.txt 2007-07-05 14:19:36.000000000 -0400
|
|
|
|
|
@@ -44,7 +44,7 @@
|
|
|
|
|
|
|
|
|
|
INSTALL(TARGETS qgisgrass
|
|
|
|
|
RUNTIME DESTINATION ${QGIS_BIN_DIR}
|
|
|
|
|
- LIBRARY DESTINATION lib)
|
|
|
|
|
+ LIBRARY DESTINATION lib${LIB_SUFFIX})
|
|
|
|
|
|
|
|
|
|
INSTALL(TARGETS grassprovider
|
|
|
|
|
RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
|
