[Kst] branches/work/kst/portto4/kst
Peter Kümmel
syntheticpp at gmx.net
Sun Jul 22 12:16:47 UTC 2012
SVN commit 1307223 by kuemmel:
update windows deploying
M +15 -8 cmake/3rdparty/CMakeLists.txt
M +1 -1 cmake/CMakeLists.txt
M +6 -7 cmake/misc/CMakeLists.txt
M +20 -6 misc/mingw-release-build-deps.bat
--- branches/work/kst/portto4/kst/cmake/3rdparty/CMakeLists.txt #1307222:1307223
@@ -33,6 +33,9 @@
set(install_target install/strip)
endif()
+if(NOT kst_make_program)
+ set(kst_make_program ${CMAKE_MAKE_PROGRAM})
+endif()
# GETDATA
set(ext_src ${build_dir}/getdata/src/getdata)
@@ -40,7 +43,7 @@
set(ext_url http://sourceforge.net/projects/getdata/files/getdata/0.8.0/getdata_win-0.8.0.zip)
set(ext_configure cmake ${ext_src}/cmake ${generator} ${rc_compiler} ${install_prefix} ${build_type})
set(ext_install ${install_target})
- set(ext_make ${CMAKE_MAKE_PROGRAM})
+ set(ext_make ${kst_make_program})
else()
set(ver 0.7.3)
set(ext_url http://sourceforge.net/projects/getdata/files/getdata/${ver}/getdata-${ver}.tar.gz)
@@ -72,7 +75,7 @@
set(ext_install ${install_target})
set(ext_insource OFF )
set(zlib_library ${install_dir}/lib/libzlibstatic.a)
- set(ext_make ${CMAKE_MAKE_PROGRAM})
+ set(ext_make ${kst_make_program})
else()
set(ext_url http://zlib.net/zlib-1.2.7.tar.gz)
set(ext_configure ${ext_src}/configure --static --prefix=${install_dir})
@@ -104,7 +107,7 @@
${build_type})
set(ext_install ${install_target})
set(ext_insource OFF )
- set(ext_make ${CMAKE_MAKE_PROGRAM})
+ set(ext_make ${kst_make_program})
else()
set(ext_url http://sourceforge.net/projects/matio/files/matio/1.5.0/matio-1.5.0.tar.gz)
set(ext_configure ${ext_src}/configure --with-pic --enable-static --disable-shared --prefix=${install_dir} --with-zlib=${install_dir})
@@ -136,6 +139,7 @@
${build_type})
set(ext_install ${install_target})
set(ext_insource OFF )
+ set(ext_make ${kst_make_program})
else()
set(ext_url ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-4.1.3.tar.gz)
set(ext_configure ${ext_src}/configure --with-pic --disable-netcdf-4
@@ -143,14 +147,15 @@
--prefix=${install_dir} --with-zlib=${install_dir})
set(ext_install install)
set(ext_insource ON)
+ set(ext_make ${CMAKE_MAKE_PROGRAM})
endif()
ExternalProject_Add(netcdf
PREFIX ${build_dir}/netcdf
URL ${ext_url}
CONFIGURE_COMMAND ${ext_configure}
BUILD_IN_SOURCE OFF
- BUILD_COMMAND ${CMAKE_MAKE_PROGRAM}
- INSTALL_COMMAND ${CMAKE_MAKE_PROGRAM} ${ext_install})
+ BUILD_COMMAND ${ext_make}
+ INSTALL_COMMAND ${ext_make} ${ext_install})
set(NETCDF_INCLUDEDIR ${install_dir}/include PARENT_SCOPE)
set(NETCDF_LIBRARY_C ${install_dir}/lib/libnetcdf.a PARENT_SCOPE)
@@ -168,7 +173,7 @@
${build_type})
set(ext_install ${install_target})
set(ext_insource OFF)
- set(ext_make ${CMAKE_MAKE_PROGRAM})
+ set(ext_make ${kst_make_program})
else()
set(ext_url ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3300.tar.gz)
set(ext_configure ${ext_src}/configure --with-pic
@@ -201,6 +206,7 @@
${build_type})
set(ext_install ${install_target})
set(ext_insource OFF )
+ set(ext_make ${kst_make_program})
else()
set(ext_url ftp://ftp.gnu.org/gnu/gsl/gsl-1.15.tar.gz)
set(ext_configure ${ext_src}/configure --with-pic
@@ -208,14 +214,15 @@
--prefix=${install_dir} --with-zlib=${install_dir})
set(ext_install install)
set(ext_insource ON)
+ set(ext_make ${CMAKE_MAKE_PROGRAM})
endif()
ExternalProject_Add(gsl
PREFIX ${build_dir}/gsl
URL ${ext_url}
CONFIGURE_COMMAND ${ext_configure}
BUILD_IN_SOURCE OFF
- BUILD_COMMAND ${CMAKE_MAKE_PROGRAM}
- INSTALL_COMMAND ${CMAKE_MAKE_PROGRAM} ${ext_install})
+ BUILD_COMMAND ${ext_make}
+ INSTALL_COMMAND ${ext_make} ${ext_install})
if(APPLE)
set(gsldeps ${install_dir}/lib/libgslcblas.a)
--- branches/work/kst/portto4/kst/cmake/CMakeLists.txt #1307222:1307223
@@ -78,7 +78,7 @@
if(MINGW)
if(GCC_VERSION VERSION_EQUAL 4.7 OR GCC_VERSION VERSION_GREATER 4.7)
set(ver 4.7)
- set(md5 554986495f67b9aa1431a59da1677e29)
+ set(md5 de6e8dbab1bb17eee6057941fddc93e3)
else(GCC_VERSION VERSION_EQUAL 4.6 OR GCC_VERSION VERSION_GREATER 4.6)
set(ver 4.6)
set(md5 70d8670af9c21eb8fb466654c95d8e4d)
--- branches/work/kst/portto4/kst/cmake/misc/CMakeLists.txt #1307222:1307223
@@ -23,14 +23,13 @@
if(MINGW)
get_filename_component(MINGW_BIN_PATH ${CMAKE_CXX_COMPILER} PATH)
- if(GCC_VERSION VERSION_EQUAL 4.7 OR GCC_VERSION VERSION_GREATER 4.7)
- set(runtime ${MINGW_BIN_PATH}/libgcc_s_dw2-1.dll ${MINGW_BIN_PATH}/mingwm10.dll)
- else(GCC_VERSION VERSION_EQUAL 4.6 OR GCC_VERSION VERSION_GREATER 4.6)
- set(runtime ${MINGW_BIN_PATH}/libgcc_s_sjlj-1.dll ${MINGW_BIN_PATH}/libwinpthread-1.dll)
- else()
- message(FATA_ERROR "MinGW version ${GCC_VERSION} not supported")
+ if(EXISTS ${MINGW_BIN_PATH}/libgcc_s_sjlj-1.dll)
+ list(APPEND runtime ${MINGW_BIN_PATH}/libgcc_s_sjlj-1.dll)
+ elseif(EXISTS ${MINGW_BIN_PATH}/libwinpthread-1.dll)
+ list(APPEND runtime ${MINGW_BIN_PATH}/libwinpthread-1.dll)
endif()
- install(FILES ${runtime} ${MINGW_BIN_PATH}/libstdc++-6.dll DESTINATION bin)
+ list(APPEND runtime ${MINGW_BIN_PATH}/libstdc++-6.dll)
+ install(FILES ${runtime} DESTINATION bin)
endif()
--- branches/work/kst/portto4/kst/misc/mingw-release-build-deps.bat #1307222:1307223
@@ -1,3 +1,4 @@
+echo off
rmdir /s/q mingw-release-build-deps
mkdir mingw-release-build-deps
@@ -3,11 +4,24 @@
cd mingw-release-build-deps
-cmake ..\kst\cmake -G"CodeBlocks - MinGW Makefiles" -Dkst_release=1 -Dkst_merge_files=1 -Dkst_3rdparty_build=1 -Dkst_install_prefix=Kst-%1 -Dkst_version_string=%1
+if "%1" == "" (
+ set ver=2.0.x
+) else (
+ set ver=%1
+)
-mingw32-make
-mingw32-make install/strip
-mingw32-make package
-mingw32-make package_source
+if "%2" == "" (
+ set make=mingw32-make
+) else (
+ set make=%2
+)
+echo cmake ..\kst\cmake -G"CodeBlocks - MinGW Makefiles" -Dkst_release=1 -Dkst_merge_files=1 -Dkst_3rdparty_build=1 -Dkst_install_prefix=Kst-%ver% -Dkst_version_string=%ver% -Dkst_make_program=%make%
+
+cmake ..\kst\cmake -G"CodeBlocks - MinGW Makefiles" -Dkst_release=1 -Dkst_merge_files=1 -Dkst_3rdparty_build=1 -Dkst_install_prefix=Kst-%ver% -Dkst_version_string=%ver% -Dkst_make_program=%make%
+
+%make%
+%make% install/strip
+%make% package
+%make% package_source
+
cd ..
-
More information about the Kst
mailing list