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

[Peter Kümmel]

SVN commit 1321329 by kuemmel:

build 3rdparty plugins on build server

and build with Qt4 and Qt5

 M  +1 -1      .travis.yml  
 M  +2 -1      cmake/CMakeLists.txt  
 M  +18 -0     cmake/modules/KstCrossCompile.cmake  
 M  +4 -3      cmake/travis.sh  


--- branches/work/kst/portto4/kst/.travis.yml #1321328:1321329
@@ -13,7 +13,7 @@
 
 script:
  - ./cmake/travis.sh qt4
-# - ./cmake/travis.sh qt5
+ - ./cmake/travis.sh qt5
 
 branches:
  only:
--- branches/work/kst/portto4/kst/cmake/CMakeLists.txt #1321328:1321329
@@ -82,6 +82,7 @@
 	message(STATUS "Using GCC version ${GCC_VERSION}")
 endif()
 
+
 if(kst_3rdparty_build)
 	set(kst_3rdparty_dir ${CMAKE_BINARY_DIR}/3rdparty/installed)
 	add_subdirectory(3rdparty)
@@ -169,7 +170,7 @@
 endif()
 
 message(STATUS)
-if(kst_3rdparty)
+if(kst_3rdparty AND NOT kst_cross)
   message(STATUS "3rd party libs for plugins--------------------")
   find_package(Getdata)
   find_package(Gsl)
--- branches/work/kst/portto4/kst/cmake/modules/KstCrossCompile.cmake #1321328:1321329
@@ -18,3 +18,21 @@
 	set(CMAKE_FIND_ROOT_PATH /usr/${TOOLNAME} ${QT_MINGW_DIR} CACHE PATH "Mingw find root path" FORCE)
 endif()
 
+
+if(kst_3rdparty_dir)
+    set(getdata 1 CACHE STRING "3rdparty" FORCE)
+    set(GETDATA_INCLUDE_DIR ${kst_3rdparty_dir}/include CACHE STRING "3rdparty" FORCE)
+    set(GETDATA_LIBRARIES   ${kst_3rdparty_dir}/lib/libgetdata++.a ${kst_3rdparty_dir}/lib/libgetdata.a CACHE STRING "3rdparty" FORCE)
+    set(gsl 1 CACHE STRING "3rdparty" FORCE)
+    set(GSL_INCLUDE_DIR     ${kst_3rdparty_dir}/include/gsl ${kst_3rdparty_dir}/include/gsl/.. CACHE STRING "3rdparty" FORCE)
+    set(GSL_LIBRARIES       ${kst_3rdparty_dir}/lib/libgsl.a CACHE STRING "3rdparty" FORCE)
+    set(netcdf 1 CACHE STRING "3rdparty" FORCE)
+    set(NETCDF_INCLUDE_DIR  ${kst_3rdparty_dir}/include CACHE STRING "3rdparty" FORCE)
+    set(NETCDF_LIBRARIES    ${kst_3rdparty_dir}/lib/libnetcdf_c++.a ${kst_3rdparty_dir}/lib/libnetcdf.a CACHE STRING "3rdparty" FORCE)
+    set(matio 1 CACHE STRING "3rdparty" FORCE)
+    set(MATIO_INCLUDE_DIR   ${kst_3rdparty_dir}/include ${kst_3rdparty_dir}/include/.. CACHE STRING "3rdparty" FORCE)
+    set(MATIO_LIBRARIES     ${kst_3rdparty_dir}/lib/libmatio.a CACHE STRING "3rdparty" FORCE)
+    set(cfitsio 1 CACHE STRING "3rdparty" FORCE)
+    set(CFITSIO_INCLUDE_DIR ${kst_3rdparty_dir}/include/cfitsio;${kst_3rdparty_dir}/include/cfitsio/.. CACHE STRING "3rdparty" FORCE)
+    set(CFITSIO_LIBRARIES   ${kst_3rdparty_dir}/lib/libcfitsio.a CACHE STRING "3rdparty" FORCE)
+endif()
--- branches/work/kst/portto4/kst/cmake/travis.sh #1321328:1321329
@@ -87,7 +87,8 @@
     qtver=4.8.4
     gccver=4.7.2
     dw2=-dw2
-    useext="-Dkst_3rdparty=1 -Dkst_3rdparty_dir=-Dkst_3rdpartylibs/opt/"$extlib
+    extlib=kst-3rdparty-win32-gcc-dw2-4.7.2
+    useext="-Dkst_3rdparty=1 -Dkst_3rdparty_dir=/opt/"$extlib
 fi
 qtver=Qt-$qtver-win32-g++-$mingw$dw2-$gccver
 mingwver=i686-w64-mingw32-gcc$dw2-$gccver
@@ -141,8 +142,7 @@
 # ---------------------------------------------------------
 #
 # download 3rdparty
-
-extlib=kst-3rdparty-win32-gcc-dw2-4.7.2
+#
 if [ ! -d /opt/$extlib ]; then
     wget https://github.com/downloads/syntheticpp/kst/$extlib.zip
     checkExitCode
@@ -150,6 +150,7 @@
     sudo unzip $builddir/$extlib.zip
     checkExitCode
     cd $builddir
+    sudo cp /opt/$extlib/include/matio_pubConf.h /opt/$extlib/include/matio_pubconf.h
 fi