From 787cdee4c320500c0a1389da3a182c231643fcc2 Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Tue, 9 Jun 2015 16:17:24 +0200 Subject: [PATCH] Extra link flags for NetCDF --- external/external_build.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/external/external_build.cmake b/external/external_build.cmake index fc033e9..5dddfac 100644 --- a/external/external_build.cmake +++ b/external/external_build.cmake @@ -121,6 +121,7 @@ else(INTERNAL_HDF5) find_library(HDF5HL_LIBRARY hdf5_hl) endif (INTERNAL_HDF5) SET(CONFIGURE_CPP_FLAGS "${CONFIGURE_CPP_FLAGS} -I${HDF5_INCLUDE_PATH}") +SET(CONFIGURE_LIBS_FLAGS "-ldl") mark_as_advanced(HDF5_INCLUDE_PATH HDF5_LIBRARY HDF5_CPP_LIBRARY HDF5HL_LIBRARY HDF5HL_CPP_LIBRARY) ############### @@ -133,7 +134,7 @@ if (INTERNAL_NETCDF) SET(NETCDF_BIN_DIR ${CMAKE_BINARY_DIR}/ext_build/netcdf) SET(CONFIGURE_CPP_FLAGS "${CONFIGURE_CPP_FLAGS} -I${NETCDF_BIN_DIR}/include") SET(CONFIGURE_LDFLAGS "${CONFIGURE_LDFLAGS} -L${NETCDF_BIN_DIR}/lib") - SET(EXTRA_NC_FLAGS CPPFLAGS=${CONFIGURE_CPP_FLAGS} LDFLAGS=${CONFIGURE_LDFLAGS}) + SET(EXTRA_NC_FLAGS CPPFLAGS=${CONFIGURE_CPP_FLAGS} LDFLAGS=${CONFIGURE_LDFLAGS} LIBS=${CONFIGURE_LIBS_FLAGS}) ExternalProject_Add(netcdf DEPENDS ${hdf5_built} PREFIX ${BUILD_PREFIX}/netcdf-prefix @@ -239,7 +240,7 @@ ExternalProject_Add(cosmotool -DGSLCBLAS_LIBRARY=${GSLCBLAS_LIBRARY} -DNETCDF_LIBRARY=${NETCDF_LIBRARY} -DNETCDFCPP_LIBRARY=${NETCDFCPP_LIBRARY} - -DENABLE_SHARP=OFF + -DENABLE_SHARP=OFF ) SET(COSMOTOOL_LIBRARY ${CMAKE_BINARY_DIR}/ext_build/cosmotool/lib/libCosmoTool.a) set(COSMOTOOL_INCLUDE_PATH ${CMAKE_BINARY_DIR}/ext_build/cosmotool/include)