Commit 59493972 authored by Vladimír Ulman's avatar Vladimír Ulman Committed by Vladimir Ulman
Browse files

CHG: CMakeLists.txt changes relevant on Mac for static build

parent b9d1f8cf

.gitignore

+2 −0
Original line number Diff line number Diff line 
# binaries

/BUILD

/BUILD_STATIC

/BUILD-STATIC



# Apple #

.DS_Store

CMakeLists.txt

+6 −6
Original line number Diff line number Diff line
@@ -121,20 +121,20 @@ IF (BUILD_STATIC) 
		  # pridat knihovny, ktere vyzaduje i3d-cko

		  FIND_LIBRARY(LIB_LAPACK lapack)

		  FIND_LIBRARY(LIB_BLAS blas)

		  FIND_LIBRARY(LIB_GFORTRAN gfortran PATHS /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3)

		  #FIND_LIBRARY(LIB_GFORTRAN gfortran PATHS /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3)

		  SET(LIBS ${LIBS} ${LIB_LAPACK} ${LIB_BLAS} ${LIB_GFORTRAN})



		  FIND_LIBRARY(LIB_TIFF tiff)

		  FIND_LIBRARY(LIB_JPEG jpeg)

		  FIND_LIBRARY(LIB_ICS ics)

		  FIND_LIBRARY(LIB_PNG png)

		  FIND_LIBRARY(LIB_HDF5_HL hdf5_hl)

		  FIND_LIBRARY(LIB_HDF5 hdf5)

		  #FIND_LIBRARY(LIB_PNG png)

		  #FIND_LIBRARY(LIB_HDF5_HL hdf5_hl)

		  #FIND_LIBRARY(LIB_HDF5 hdf5)

		  

		  SET(LIBS ${LIBS} ${LIB_TIFF} ${LIB_JPEG} ${LIB_ICS}

		  					 ${LIB_PNG} ${LIB_HDF5} ${LIB_HDF5_HL})



		  FIND_LIBRARY(LIB_LZMA lzma)

		  #FIND_LIBRARY(LIB_LZMA lzma)

		  FIND_LIBRARY(LIB_Z z)



		  SET(LIBS ${LIBS} ${LIB_LZMA} ${LIB_Z})
@@ -154,7 +154,7 @@ IF (BUILD_STATIC) 
					 ${LIB_FFTW_LDOUBLE})



		  FIND_LIBRARY(LIB_GSL gsl)

		  FIND_LIBRARY(LIB_GOMP gomp PATHS /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3)

		  #FIND_LIBRARY(LIB_GOMP gomp PATHS /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3)

		  FIND_LIBRARY(LIB_PTHREAD pthread)



		  SET(LIBS ${LIBS} ${LIB_GSL} ${LIB_GOMP} ${LIB_PTHREAD})