[Kst] branches/work/kst/portto4/kst

[Peter Kümmel]

SVN commit 1131599 by kuemmel:

MinGW support

 M  +10 -2     misc/netcdf-windows/CMakeLists.txt  
 AM            misc/netcdf-windows/config-mingw.h   [License: UNKNOWN]
 AM            misc/netcdf-windows/config-msvc.h   [License: UNKNOWN]
 D             misc/netcdf-windows/config.h  
 M  +1 -1      src/datasources/netcdf/netcdf.pro  


--- branches/work/kst/portto4/kst/misc/netcdf-windows/CMakeLists.txt #1131598:1131599
@@ -19,11 +19,19 @@
 	set(CMAKE_C_FLAGS_RELEASE
 		"${CMAKE_C_FLAGS_RELEASE} /Wp64 ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
 		
-	add_definitions(-D_FILE_OFFSET_BITS=64)
-	include_directories(.)
 	set(CMAKE_DEBUG_POSTFIX d)
+	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-msvc.h ${CMAKE_BINARY_DIR}/config.h COPYONLY)
+	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/inttypes.h ${CMAKE_BINARY_DIR}/inttypes.h COPYONLY)
+	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/stdint.h ${CMAKE_BINARY_DIR}/stdint.h COPYONLY)
 endif()
 
+if(WIN32 AND NOT MSVC)
+	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-mingw.h ${CMAKE_BINARY_DIR}/config.h COPYONLY)
+endif()
+
+add_definitions(-D_FILE_OFFSET_BITS=64)	
+include_directories(${CMAKE_BINARY_DIR})
+
 set(NETCDF_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/installed)
 
 add_subdirectory(libsrc)
--- branches/work/kst/portto4/kst/src/datasources/netcdf/netcdf.pro #1131598:1131599
@@ -13,7 +13,7 @@
 	LIBS += -L$$(NETCDFDIR)/lib
 }
 
-LIBS += -l$$kstlib(netcdf) -l$$kstlib(netcdf_c++)
+LIBS += -l$$kstlib(netcdf_c++) -l$$kstlib(netcdf) 
 
 SOURCES += \
     kstnetcdf.cpp