From 889a7426f6410b05f4b55a6a30d3d6ccd38eb55f Mon Sep 17 00:00:00 2001 From: "Vladimir S. FONOV" Date: Mon, 8 Feb 2016 12:02:22 -0500 Subject: [PATCH] Fixing mixup between library locations on different platforms --- cmake-modules/BuildFFTW3F.cmake | 2 +- cmake-modules/BuildGSL.cmake | 2 +- cmake-modules/BuildHDF5.cmake | 2 +- cmake-modules/BuildNETCDF.cmake | 2 +- cmake-modules/BuildPCRE.cmake | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake-modules/BuildFFTW3F.cmake b/cmake-modules/BuildFFTW3F.cmake index 3e3d640..d3c87da 100644 --- a/cmake-modules/BuildFFTW3F.cmake +++ b/cmake-modules/BuildFFTW3F.cmake @@ -26,7 +26,7 @@ macro(build_fftw3f install_prefix staging_prefix) INSTALL_DIR "${staging_prefix}" BUILD_COMMAND $(MAKE) INSTALL_COMMAND $(MAKE) DESTDIR=${staging_prefix} install - CONFIGURE_COMMAND ./configure ${FFTW3F_CONFIG} --prefix=${install_prefix} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} "CXXFLAGS=${EXT_CXX_FLAGS}" "CFLAGS=${EXT_C_FLAGS}" + CONFIGURE_COMMAND ./configure ${FFTW3F_CONFIG} --libdir=${install_prefix}/lib${LIB_SUFFIX} --prefix=${install_prefix} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} "CXXFLAGS=${EXT_CXX_FLAGS}" "CFLAGS=${EXT_C_FLAGS}" # INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/external ) diff --git a/cmake-modules/BuildGSL.cmake b/cmake-modules/BuildGSL.cmake index a838e22..8e0b411 100644 --- a/cmake-modules/BuildGSL.cmake +++ b/cmake-modules/BuildGSL.cmake @@ -19,7 +19,7 @@ ExternalProject_Add(GSL INSTALL_DIR "${CMAKE_BINARY_DIR}/external" BUILD_COMMAND $(MAKE) INSTALL_COMMAND $(MAKE) DESTDIR=${CMAKE_BINARY_DIR}/external install - CONFIGURE_COMMAND ./configure --prefix=${install_prefix} --with-pic --disable-shared --enable-static CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} "CPPFLAGS=${EXT_CXX_FLAGS}" "CXXFLAGS=${EXT_CXX_FLAGS}" "CFLAGS=${EXT_C_FLAGS}" "LDFLAGS=${EXT_LDFLAGS}" + CONFIGURE_COMMAND ./configure --prefix=${install_prefix} --libdir=${install_prefix}/lib${LIB_SUFFIX} --with-pic --disable-shared --enable-static CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} "CPPFLAGS=${EXT_CXX_FLAGS}" "CXXFLAGS=${EXT_CXX_FLAGS}" "CFLAGS=${EXT_C_FLAGS}" "LDFLAGS=${EXT_LDFLAGS}" # INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/external ) diff --git a/cmake-modules/BuildHDF5.cmake b/cmake-modules/BuildHDF5.cmake index 301e69a..9e244f3 100644 --- a/cmake-modules/BuildHDF5.cmake +++ b/cmake-modules/BuildHDF5.cmake @@ -10,7 +10,7 @@ ExternalProject_Add(HDF5 INSTALL_DIR "${CMAKE_BINARY_DIR}/external" BUILD_COMMAND $(MAKE) INSTALL_COMMAND $(MAKE) DESTDIR=${CMAKE_BINARY_DIR}/external install - CONFIGURE_COMMAND ./configure --prefix=${install_prefix} --with-zlib=${zlib_include_dir},${zlib_library_dir} --with-pic --disable-shared --enable-cxx --disable-f77 --disable-f90 --disable-examples --disable-hl --disable-docs --libdir=${install_prefix}/lib${LIB_SUFFIX} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} + CONFIGURE_COMMAND ./configure --prefix=${install_prefix} --libdir=${install_prefix}/lib${LIB_SUFFIX} --with-zlib=${zlib_include_dir},${zlib_library_dir} --with-pic --disable-shared --enable-cxx --disable-f77 --disable-f90 --disable-examples --disable-hl --disable-docs --libdir=${install_prefix}/lib${LIB_SUFFIX} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} # INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/external ) diff --git a/cmake-modules/BuildNETCDF.cmake b/cmake-modules/BuildNETCDF.cmake index 2152b42..00cc50e 100644 --- a/cmake-modules/BuildNETCDF.cmake +++ b/cmake-modules/BuildNETCDF.cmake @@ -17,7 +17,7 @@ ExternalProject_Add(NETCDF INSTALL_DIR "${staging_prefix}" BUILD_COMMAND $(MAKE) INSTALL_COMMAND $(MAKE) DESTDIR=${staging_prefix} install - CONFIGURE_COMMAND ./configure --prefix=${install_prefix} --with-pic --disable-doxygen --disable-hdf4 --disable-netcdf-4 --disable-shared --disable-dap --libdir=${install_prefix}/lib${LIB_SUFFIX} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} "CXXFLAGS=${EXT_CXX_FLAGS}" "CFLAGS=${EXT_C_FLAGS}" + CONFIGURE_COMMAND ./configure --prefix=${install_prefix} --libdir=${install_prefix}/lib${LIB_SUFFIX} --with-pic --disable-doxygen --disable-hdf4 --disable-netcdf-4 --disable-shared --disable-dap --libdir=${install_prefix}/lib${LIB_SUFFIX} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} "CXXFLAGS=${EXT_CXX_FLAGS}" "CFLAGS=${EXT_C_FLAGS}" ) SET(NETCDF_LIBRARY ${staging_prefix}/${install_prefix}/lib${LIB_SUFFIX}/libnetcdf.a ) diff --git a/cmake-modules/BuildPCRE.cmake b/cmake-modules/BuildPCRE.cmake index 758c374..671f95b 100644 --- a/cmake-modules/BuildPCRE.cmake +++ b/cmake-modules/BuildPCRE.cmake @@ -16,7 +16,7 @@ ExternalProject_Add(PCRE INSTALL_DIR "${staging_prefix}" BUILD_COMMAND $(MAKE) INSTALL_COMMAND $(MAKE) DESTDIR=${staging_prefix} install - CONFIGURE_COMMAND ./configure --prefix=${install_prefix} --with-pic --disable-shared --enable-cpp CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} "CXXFLAGS=${EXT_CXX_FLAGS}" "CFLAGS=${EXT_C_FLAGS}" + CONFIGURE_COMMAND ./configure --prefix=${install_prefix} --libdir=${install_prefix}/lib${LIB_SUFFIX} --with-pic --disable-shared --enable-cpp CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} "CXXFLAGS=${EXT_CXX_FLAGS}" "CFLAGS=${EXT_C_FLAGS}" ) SET(PCRE_INCLUDE_DIR ${staging_prefix}/${install_prefix}/include )