fix building python plugin on windows

jef · jef · commit 238ef96fd68e · 2008-05-28T19:49:14.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8536 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -173,7 +173,6 @@ ENDIF (CMAKE_BUILD_TYPE MATCHES Debug)
 # 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 @@ IF (WIN32)
     # 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 @@ IF (WIN32)
     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 (WIN32)
   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
diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
@@ -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 @@ TARGET_LINK_LIBRARIES(qgispython
   ${QT_QTCORE_LIBRARY} 
   ${QT_QTGUI_LIBRARY} 
   ${PYTHON_LIBRARIES}
+  qgis_core
 )
 
 INSTALL(TARGETS qgispython
diff --git a/src/python/qgspythonutils.h b/src/python/qgspythonutils.h
@@ -33,7 +33,7 @@ class QgisInterface;
 
  */
 
-class QgsPythonUtils
+class PYTHON_EXPORT QgsPythonUtils
 {
   public:
     

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class QgisInterface;`
`33`	`33`
`34`	`34`	`*/`
`35`	`35`
`36`		`-class QgsPythonUtils`
	`36`	`+class PYTHON_EXPORT QgsPythonUtils`
`37`	`37`	`{`
`38`	`38`	`public:`
`39`	`39`