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

[Peter Kümmel]

SVN commit 1304337 by kuemmel:

mac fixes

 M  +3 -4      cmake/3rdparty/CMakeLists.txt  
 M  +6 -1      misc/mac-release.sh  
 D             misc/macdeploykst  


--- branches/work/kst/portto4/kst/cmake/3rdparty/CMakeLists.txt #1304336:1304337
@@ -34,7 +34,6 @@
 endif()
 
 
-
 # GETDATA
 set(ext_src ${build_dir}/getdata/src/getdata)
 if(WIN32)
@@ -59,7 +58,7 @@
 					INSTALL_COMMAND ${CMAKE_MAKE_PROGRAM} ${ext_install})
 
 set(GETDATA_INCLUDEDIR ${install_dir}/include PARENT_SCOPE)
-set(GETDATA_LIBRARIES  ${install_dir}/lib/libgetdata++.a  ${install_dir}/lib/libgetdata.a PARENT_SCOPE)
+set(GETDATA_LIBRARIES  ${install_dir}/lib/libgetdata++.a -lbz2 -lz ${install_dir}/lib/libgetdata.a PARENT_SCOPE)
 
 
 # ZLIB needed by MATIO
@@ -137,7 +136,7 @@
 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
-											--enable-static --disable-shared
+											--enable-static --disable-shared   --disable-curl --disable-dap 
 											--prefix=${install_dir} --with-zlib=${install_dir})
 	set(ext_install install)
 	set(ext_insource ON)
@@ -216,7 +215,7 @@
 					INSTALL_COMMAND ${CMAKE_MAKE_PROGRAM} ${ext_install})
 
 set(GSL_INCLUDEDIR ${install_dir}/include PARENT_SCOPE)
-set(GSL_LIBRARIES  ${install_dir}/lib/libgsl.a PARENT_SCOPE)
+set(GSL_LIBRARIES  ${install_dir}/lib/libgsl.a ${install_dir}/lib/libgslcblas.a PARENT_SCOPE)
 
 
 
--- branches/work/kst/portto4/kst/misc/mac-release.sh #1304336:1304337
@@ -5,10 +5,15 @@
 
 kst_install_prefix=Kst-$2
 
-cmake $1 -Dkst_merge_files=1 -Dkst_3rdparty=1 -Dkst_dataobjects=1 -Dkst_version_string=$2 -Dkst_release=1 -Dkst_install_prefix=$kst_install_prefix
+cmake $1 -Dkst_merge_files=1 -Dkst_3rdparty_build=1 -Dkst_dataobjects=1 -Dkst_version_string=$2 -Dkst_release=1 -Dkst_install_prefix=$kst_install_prefix
 
+cd 3rdparty
 make -j4
+make
+cd ..
 
+make -j4
+
 make install/strip
 
 #TODO Why is /build/bin/kst2 added to the dmg?