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

[Peter Kümmel]

SVN commit 1157527 by kuemmel:

MinGW release: build all from scratch

 M  +2 -1      kst.pri  
 M  +4 -4      misc/getdata-windows/cmake/CMakeLists.txt  
 M  +2 -2      misc/getdata-windows/cmake/bindings/cxx/CMakeLists.txt  
 M  +2 -2      misc/getdata-windows/cmake/src/CMakeLists.txt  
 M  +6 -3      misc/gsl-windows/CMakeLists.txt  
 A             misc/mingw-release.bat  
 M  +3 -1      misc/netcdf-windows/CMakeLists.txt  
 M  +2 -2      misc/netcdf-windows/cxx/CMakeLists.txt  
 M  +2 -2      misc/netcdf-windows/libsrc/CMakeLists.txt  


--- branches/work/kst/portto4/kst/kst.pri #1157526:1157527
@@ -21,7 +21,8 @@
 
 QT += core xml
 
-CONFIG += silent warn_on
+CONFIG += warn_on
+!win32:CONFIG += silent
 
 DEBUG_MODE = $$(KST_DEBUG_MODE)
 contains(DEBUG_MODE, 1) {
--- branches/work/kst/portto4/kst/misc/getdata-windows/cmake/CMakeLists.txt #1157526:1157527
@@ -36,18 +36,16 @@
 		-DGD_USE_CPP
 		-DHAVE_STDINT_H
 		)
-		
 	set(CMAKE_DEBUG_POSTFIX d)
         configure_file(inttypes.h ${CMAKE_CURRENT_BINARY_DIR}/inttypes.h COPYONLY)
 endif()
 
-
 if(MINGW)
 	# ALPHA quality!
 	add_definitions(
 			-D__MSVCRT__
 			-DSTDC_HEADER
-			-DHAVE_INTTYPES_H
+			-DSTDC_HEADER
 			-DHAVE_IO_H
 			-DHAVE_STDINT_H
 			-DHAVE_COMPLEX_H
@@ -68,7 +66,9 @@
 
 include_directories(${GETDATA_DIR}/src ${CMAKE_CURRENT_BINARY_DIR})
 
-set(GETDATA_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/installed)
+if (NOT CMAKE_INSTALL_PREFIX)
+	set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/installed)
+endif()
 
 add_subdirectory(src)
 add_subdirectory(bindings)
--- branches/work/kst/portto4/kst/misc/getdata-windows/cmake/bindings/cxx/CMakeLists.txt #1157526:1157527
@@ -7,5 +7,5 @@
 add_library(getdata++ STATIC ${h_headers} ${s_sources})
 
 
-install(FILES ${h_headers} DESTINATION ${GETDATA_INSTALL_DIR}/include/getdata)
-install(TARGETS getdata++ DESTINATION ${GETDATA_INSTALL_DIR}/lib)
+install(FILES ${h_headers} DESTINATION include/getdata)
+install(TARGETS getdata++ DESTINATION lib)
--- branches/work/kst/portto4/kst/misc/getdata-windows/cmake/src/CMakeLists.txt #1157526:1157527
@@ -75,7 +75,7 @@
 
 
 
-install(FILES ${CMAKE_BINARY_DIR}/getdata.h DESTINATION ${GETDATA_INSTALL_DIR}/include)
-install(TARGETS getdata DESTINATION ${GETDATA_INSTALL_DIR}/lib)
+install(FILES ${CMAKE_BINARY_DIR}/getdata.h DESTINATION include)
+install(TARGETS getdata DESTINATION lib)
 
 
--- branches/work/kst/portto4/kst/misc/gsl-windows/CMakeLists.txt #1157526:1157527
@@ -669,8 +669,11 @@
 
 add_library(gsl STATIC ${gsl_source_list} ${cblas_source_list} ${gsl_headers})
 
-set(GSL_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/installed)
-install(FILES ${gsl_headers} DESTINATION ${GSL_INSTALL_DIR}/include/gsl)
-install(TARGETS gsl DESTINATION ${GSL_INSTALL_DIR}/lib)
+if (NOT CMAKE_INSTALL_PREFIX)
+	set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/installed)
+endif()
 
+install(FILES ${gsl_headers} DESTINATION include/gsl)
+install(TARGETS gsl DESTINATION lib)
 
+
--- branches/work/kst/portto4/kst/misc/netcdf-windows/CMakeLists.txt #1157526:1157527
@@ -32,7 +32,9 @@
 add_definitions(-D_FILE_OFFSET_BITS=64)	
 include_directories(${CMAKE_BINARY_DIR})
 
-set(NETCDF_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/installed)
+if (NOT CMAKE_INSTALL_PREFIX)
+	set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/installed)
+endif()
 
 add_subdirectory(libsrc)
 add_subdirectory(cxx)
--- branches/work/kst/portto4/kst/misc/netcdf-windows/cxx/CMakeLists.txt #1157526:1157527
@@ -22,6 +22,6 @@
 
 target_link_libraries(netcdf_c++ netcdf)
 
-install(FILES ${HEADERS} DESTINATION ${NETCDF_INSTALL_DIR}/include)
-install(TARGETS netcdf_c++ DESTINATION ${NETCDF_INSTALL_DIR}/lib)
+install(FILES ${HEADERS} DESTINATION include)
+install(TARGETS netcdf_c++ DESTINATION lib)
 
--- branches/work/kst/portto4/kst/misc/netcdf-windows/libsrc/CMakeLists.txt #1157526:1157527
@@ -36,6 +36,6 @@
 add_library(netcdf STATIC ${SOURCES} ${HEADERS})
 
 
-install(FILES ${TOP_DIR}/libsrc/netcdf.h DESTINATION ${NETCDF_INSTALL_DIR}/include)
-install(TARGETS netcdf DESTINATION ${NETCDF_INSTALL_DIR}/lib)
+install(FILES ${TOP_DIR}/libsrc/netcdf.h DESTINATION include)
+install(TARGETS netcdf DESTINATION lib)