Skip to content

Commit

Permalink
Merge pull request #224 from itesla/thirdparties
Browse files Browse the repository at this point in the history
Remove boost and log4cpp dependencies
  • Loading branch information
geofjamg committed Mar 8, 2017
2 parents 57e95fa + 011b456 commit 050e63e
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 31 deletions.
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ endif()
set(BOOST_ROOT ${thirdparty_prefix}/boost)
set(LOG4CPP_HOME ${thirdparty_prefix}/log4cpp)
set(SZIP_HOME ${thirdparty_prefix}/szip)
set(ZLIB_HOME ${thirdparty_prefix}/zlib)
set(HDF5_HOME ${thirdparty_prefix}/hdf5)
set(MATIO_HOME ${thirdparty_prefix}/matio)

Expand Down
30 changes: 0 additions & 30 deletions thirdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,46 +34,16 @@ endif()

set(CMAKE_BINARY_DIR ${prefix}/build)

set(boost_md5 25f9a8ac28beeb5ab84aa98510305299)
if (download)
set(boost_url http://sourceforge.net/projects/boost/files/boost/1.57.0/boost_1_57_0.tar.gz/download)
set(log4cpp_url http://sourceforge.net/projects/log4cpp/files/log4cpp-1.1.x%20%28new%29/log4cpp-1.1/log4cpp-1.1.1.tar.gz)
set(szip_url https://support.hdfgroup.org/ftp/lib-external/szip/2.1/src/szip-2.1.tar.gz)
set(hdf5_url https://support.hdfgroup.org/ftp/HDF5//releases/hdf5-1.8.13/src/hdf5-1.8.13.tar.gz)
set(matio_url http://downloads.sourceforge.net/project/matio/matio/1.5.2/matio-1.5.2.tar.gz)
else()
set(boost_url ${packs}/boost_1_57_0.tar.gz)
set(log4cpp_url ${packs}/log4cpp-1.1.1.tar.gz)
set(szip_url ${packs}/szip-2.1.tar.gz)
set(hdf5_url ${packs}/hdf5-1.8.13.tar.gz)
set(matio_url ${packs}/matio-1.5.2.tar.gz)
endif()

# boost
ExternalProject_Add(boost_project
INSTALL_DIR ${prefix}/boost
URL ${boost_url}
URL_MD5 ${boost_md5}
UPDATE_COMMAND ""
CONFIGURE_COMMAND ./bootstrap.sh --with-libraries=system,filesystem,iostreams,program_options
BUILD_COMMAND ./b2 cxxflags=-fPIC install --prefix=<INSTALL_DIR>
BUILD_IN_SOURCE 1
INSTALL_COMMAND ""
)
ExternalProject_Get_Property(boost_project install_dir)
set(boost_install_dir ${install_dir})

# log4cpp
ExternalProject_Add(log4cpp_project
INSTALL_DIR ${prefix}/log4cpp
URL ${log4cpp_url}
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> CXXFLAGS=-fPIC LDFLAGS=-fPIC
BUILD_COMMAND make
INSTALL_COMMAND make install
)
ExternalProject_Get_Property(log4cpp_project install_dir)
set(log4cpp_install_dir ${install_dir})

# szip
ExternalProject_Add(szip_project
INSTALL_DIR ${prefix}/szip
Expand Down

0 comments on commit 050e63e

Please sign in to comment.