[QGIS Commit] r8536 - in trunk/qgis: . src/python

[svn_qgis at osgeo.org]

Author: jef
Date: 2008-05-28 15:49:14 -0400 (Wed, 28 May 2008)
New Revision: 8536

Modified:
   trunk/qgis/CMakeLists.txt
   trunk/qgis/src/python/CMakeLists.txt
   trunk/qgis/src/python/qgspythonutils.h
Log:
fix building python plugin on windows

Modified: trunk/qgis/CMakeLists.txt
===================================================================
--- trunk/qgis/CMakeLists.txt	2008-05-28 16:27:09 UTC (rev 8535)
+++ trunk/qgis/CMakeLists.txt	2008-05-28 19:49:14 UTC (rev 8536)
@@ -173,7 +173,6 @@
 # platform specific stuff
 
 IF (WIN32)
-  SET (DEFAULT_BIN_SUBDIR     .)
   SET (DEFAULT_LIB_SUBDIR     lib)
   SET (DEFAULT_DATA_SUBDIR    .)
   SET (DEFAULT_PLUGIN_SUBDIR  plugins)
@@ -185,6 +184,7 @@
     # will pop up mid way through the build process and block
     # the build, plus the python bindings wont build correctly
     SET (CMAKE_MAKE_PROGRAM nmake)
+    SET (DEFAULT_BIN_SUBDIR bin)
     # put all the build products into a single directory
     # under build (doesnt affect install target) to make for
     # easier debugging.
@@ -210,6 +210,8 @@
     ADD_DEFINITIONS(-DQGISDEBUG=1)
 
     INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/win_build/vcdeps/. DESTINATION .)
+  ELSE(MSVC)
+    SET (DEFAULT_BIN_SUBDIR     .)
   ENDIF(MSVC)
 ELSE (WIN32)
 
@@ -239,9 +241,11 @@
   IF (MSVC)
     ADD_DEFINITIONS("-DCORE_EXPORT=__declspec(dllimport)")
     ADD_DEFINITIONS("-DGUI_EXPORT=__declspec(dllimport)")
+    ADD_DEFINITIONS("-DPYTHON_EXPORT=__declspec(dllimport)")
   ELSE (MSVC)
     ADD_DEFINITIONS("\"-DCORE_EXPORT=__declspec(dllimport)\"")
     ADD_DEFINITIONS("\"-DGUI_EXPORT=__declspec(dllimport)\"")
+    ADD_DEFINITIONS("\"-DPYTHON_EXPORT=__declspec(dllimport)\"")
   ENDIF (MSVC)
 ELSE (WIN32)
   # other compilers don't use that MSVC construct

Modified: trunk/qgis/src/python/CMakeLists.txt
===================================================================
--- trunk/qgis/src/python/CMakeLists.txt	2008-05-28 16:27:09 UTC (rev 8535)
+++ trunk/qgis/src/python/CMakeLists.txt	2008-05-28 19:49:14 UTC (rev 8536)
@@ -1,3 +1,13 @@
+IF (WIN32)
+  IF (MSVC)
+    ADD_DEFINITIONS("-DPYTHON_EXPORT=__declspec(dllexport)")
+  ELSE (MSVC)
+    ADD_DEFINITIONS("\"-DPYTHON_EXPORT=__declspec(dllexport)\"")
+  ENDIF (MSVC)
+ELSE (WIN32)
+  # other compilers don't use that MSVC construct
+  ADD_DEFINITIONS(-DPYTHON_EXPORT=)
+ENDIF (WIN32)
 
 SET(QGISPYTHON_SRCS qgispython.cpp qgspythonutilsimpl.cpp)
 
@@ -18,6 +28,7 @@
   ${QT_QTCORE_LIBRARY} 
   ${QT_QTGUI_LIBRARY} 
   ${PYTHON_LIBRARIES}
+  qgis_core
 )
 
 INSTALL(TARGETS qgispython

Modified: trunk/qgis/src/python/qgspythonutils.h
===================================================================
--- trunk/qgis/src/python/qgspythonutils.h	2008-05-28 16:27:09 UTC (rev 8535)
+++ trunk/qgis/src/python/qgspythonutils.h	2008-05-28 19:49:14 UTC (rev 8536)
@@ -33,7 +33,7 @@
 
  */
 
-class QgsPythonUtils
+class PYTHON_EXPORT QgsPythonUtils
 {
   public: