[QGIS Commit] r9044 - in trunk/qgis/src: app python

[svn_qgis at osgeo.org]

Author: jef
Date: 2008-08-10 15:44:20 -0400 (Sun, 10 Aug 2008)
New Revision: 9044

Modified:
   trunk/qgis/src/app/qgisapp.cpp
   trunk/qgis/src/python/CMakeLists.txt
Log:
new fix for #1214 (reverts r9030)

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2008-08-10 18:25:58 UTC (rev 9043)
+++ trunk/qgis/src/app/qgisapp.cpp	2008-08-10 19:44:20 UTC (rev 9044)
@@ -3834,6 +3834,9 @@
 #ifdef Q_WS_MAC
   pythonlibName.prepend(QgsApplication::prefixPath() + "/lib/");
 #endif
+#ifdef __MINGW32__
+  pythonlibName.prepend("lib");
+#endif
   QLibrary pythonlib(pythonlibName);
   // It's necessary to set these two load hints, otherwise Python library won't work correctly
   // see http://lists.kde.org/?l=pykde&m=117190116820758&w=2

Modified: trunk/qgis/src/python/CMakeLists.txt
===================================================================
--- trunk/qgis/src/python/CMakeLists.txt	2008-08-10 18:25:58 UTC (rev 9043)
+++ trunk/qgis/src/python/CMakeLists.txt	2008-08-10 19:44:20 UTC (rev 9044)
@@ -1,11 +1,8 @@
-SET(TARGET_NAME "qgispython")
-
 IF (WIN32)
   IF (MSVC)
     ADD_DEFINITIONS("-DPYTHON_EXPORT=__declspec(dllexport)")
   ELSE (MSVC)
     ADD_DEFINITIONS("\"-DPYTHON_EXPORT=__declspec(dllexport)\"")
-    SET(TARGET_NAME "libqgispython")
   ENDIF (MSVC)
 ELSE (WIN32)
   # other compilers don't use that MSVC construct
@@ -22,20 +19,20 @@
   ../gui
   ${PYTHON_INCLUDE_PATH})
 
-ADD_LIBRARY (${TARGET_NAME} SHARED ${QGISPYTHON_SRCS})
+ADD_LIBRARY (qgispython SHARED ${QGISPYTHON_SRCS})
 
-SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES 
+SET_TARGET_PROPERTIES(qgispython PROPERTIES 
 			VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}
 			SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR})
 
 
-TARGET_LINK_LIBRARIES(${TARGET_NAME}
+TARGET_LINK_LIBRARIES(qgispython
   ${QT_QTCORE_LIBRARY} 
   ${QT_QTGUI_LIBRARY} 
   ${PYTHON_LIBRARIES}
   qgis_core
 )
 
-INSTALL(TARGETS ${TARGET_NAME}
+INSTALL(TARGETS qgispython
   RUNTIME DESTINATION ${QGIS_BIN_DIR}
   LIBRARY DESTINATION ${QGIS_LIB_DIR})