Fix installation setup for lib64

BIC-MNI · Dec 14, 2012 · 5929924 · 5929924
1 parent cf609fc
commit 5929924
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cmake-modules/BuildHDF5.cmake b/cmake-modules/BuildHDF5.cmake
@@ -10,12 +10,12 @@ 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 --disable-cxx --disable-f77 --disable-f90 --disable-examples --disable-hl --disable-docs
+  CONFIGURE_COMMAND ./configure --prefix=${install_prefix} --with-zlib=${zlib_include_dir},${zlib_library_dir} --with-pic --disable-shared --disable-cxx --disable-f77 --disable-f90 --disable-examples --disable-hl --disable-docs --libdir=${install_prefix}/lib${LIB_SUFFIX}
 #  INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/external
 )
 
 SET(HDF5_INCLUDE_DIR ${staging_prefix}/${install_prefix}/include )
-SET(HDF5_LIBRARY     ${staging_prefix}/${install_prefix}/lib/libhdf5.a )
+SET(HDF5_LIBRARY     ${staging_prefix}/${install_prefix}/lib${LIB_SUFFIX}/libhdf5.a )
 SET(HDF5_FOUND ON)
 
 endmacro(build_hdf5)
diff --git a/cmake-modules/BuildNETCDF.cmake b/cmake-modules/BuildNETCDF.cmake
@@ -8,11 +8,11 @@ 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
+  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}
 #  INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/external
 )
 
-SET(NETCDF_LIBRARY     ${staging_prefix}/${install_prefix}/lib/libnetcdf.a )
+SET(NETCDF_LIBRARY     ${staging_prefix}/${install_prefix}/lib${LIB_SUFFIX}/libnetcdf.a )
 SET(NETCDF_INCLUDE_DIR ${staging_prefix}/${install_prefix}/include )
 SET(NETCDF_FOUND ON)