Commit 359b80a2 authored by Dave Moxey's avatar Dave Moxey

Fix indentation

parent 8df542a8
......@@ -11,47 +11,47 @@ IF (THIRDPARTY_BUILD_BOOST)
INCLUDE(ExternalProject)
# Only build the libraries we need
SET(BOOST_LIB_LIST --with-system --with-iostreams --with-filesystem
SET(BOOST_LIB_LIST --with-system --with-iostreams --with-filesystem
--with-program_options --with-date_time --with-thread
--with-regex)
IF (NOT WIN32)
IF (NOT WIN32)
# We need -fPIC for 64-bit builds
IF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
SET(BOOST_FLAGS cxxflags=-fPIC cflags=-fPIC linkflags=-fPIC)
ENDIF ()
ENDIF()
# Build Boost
# Build Boost
IF (APPLE)
SET(TOOLSET darwin)
ELSE(APPLE)
SET(TOOLSET gcc)
ENDIF(APPLE)
IF (NOT WIN32)
EXTERNALPROJECT_ADD(
boost
PREFIX ${TPSRC}
URL ${TPURL}/boost_1_55_0.tar.bz2
URL_MD5 "d6eef4b4cacb2183f2bf265a5a03a354"
STAMP_DIR ${TPBUILD}/stamp
DOWNLOAD_DIR ${TPSRC}
SOURCE_DIR ${TPBUILD}/boost
BINARY_DIR ${TPBUILD}/boost
TMP_DIR ${TPBUILD}/boost-tmp
INSTALL_DIR ${TPDIST}
CONFIGURE_COMMAND CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ./bootstrap.sh --prefix=${TPDIST}
IF (NOT WIN32)
EXTERNALPROJECT_ADD(
boost
PREFIX ${TPSRC}
URL ${TPURL}/boost_1_55_0.tar.bz2
URL_MD5 "d6eef4b4cacb2183f2bf265a5a03a354"
STAMP_DIR ${TPBUILD}/stamp
DOWNLOAD_DIR ${TPSRC}
SOURCE_DIR ${TPBUILD}/boost
BINARY_DIR ${TPBUILD}/boost
TMP_DIR ${TPBUILD}/boost-tmp
INSTALL_DIR ${TPDIST}
CONFIGURE_COMMAND CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ./bootstrap.sh --prefix=${TPDIST}
BUILD_COMMAND NO_BZIP2=1 ./b2
variant=release
link=shared
link=shared
include=${TPDIST}/include
linkflags="-L${TPDIST}/lib"
${BOOST_FLAGS} ${BOOST_LIB_LIST}
${BOOST_FLAGS} ${BOOST_LIB_LIST}
--layout=system toolset=${TOOLSET} install
INSTALL_COMMAND ""
)
ELSE ()
ELSE ()
EXTERNALPROJECT_ADD(
boost
PREFIX ${TPSRC}
......@@ -67,16 +67,16 @@ IF (THIRDPARTY_BUILD_BOOST)
BUILD_COMMAND b2 variant=release
toolset=msvc-12.0
address-model=32
-s NO_BZIP2=1
-s ZLIB_BINARY=zlib
-s ZLIB_INCLUDE=${TPDIST}/include
-s ZLIB_LIBPATH=${TPDIST}/lib
${BOOST_LIB_LIST}
--layout=system --prefix=${TPDIST} install
-s NO_BZIP2=1
-s ZLIB_BINARY=zlib
-s ZLIB_INCLUDE=${TPDIST}/include
-s ZLIB_LIBPATH=${TPDIST}/lib
${BOOST_LIB_LIST}
--layout=system --prefix=${TPDIST} install
INSTALL_COMMAND ""
)
ENDIF()
ENDIF()
IF (APPLE)
EXTERNALPROJECT_ADD_STEP(boost patch-install-path
COMMAND sed -i ".bak" "s|-install_name \"|&${TPDIST}/lib/|" ${TPSRC}/boost/tools/build/v2/tools/darwin.jam
......@@ -91,57 +91,57 @@ IF (THIRDPARTY_BUILD_BOOST)
# Set up CMake variables
IF (WIN32)
SET(Boost_DATE_TIME_LIBRARY libboost_date_time)
SET(Boost_DATE_TIME_LIBRARY_DEBUG libboost_date_time)
SET(Boost_DATE_TIME_LIBRARY_RELEASE libboost_date_time)
SET(Boost_FILESYSTEM_LIBRARY libboost_filesystem)
SET(Boost_FILESYSTEM_LIBRARY_DEBUG libboost_filesystem)
SET(Boost_FILESYSTEM_LIBRARY_RELEASE libboost_filesystem)
SET(Boost_IOSTREAMS_LIBRARY libboost_iostreams)
SET(Boost_IOSTREAMS_LIBRARY_DEBUG libboost_iostreams)
SET(Boost_IOSTREAMS_LIBRARY_RELEASE libboost_iostreams)
SET(Boost_PROGRAM_OPTIONS_LIBRARY libboost_program_options)
SET(Boost_PROGRAM_OPTIONS_LIBRARY_DEBUG libboost_program_options)
SET(Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE libboost_program_options)
SET(Boost_REGEX_LIBRARY libboost_regex)
SET(Boost_REGEX_LIBRARY_DEBUG libboost_regex)
SET(Boost_REGEX_LIBRARY_RELEASE libboost_regex)
SET(Boost_SYSTEM_LIBRARY libboost_system)
SET(Boost_SYSTEM_LIBRARY_DEBUG libboost_system)
SET(Boost_SYSTEM_LIBRARY_RELEASE libboost_system)
SET(Boost_THREAD_LIBRARY libboost_thread)
SET(Boost_THREAD_LIBRARY_DEBUG libboost_thread)
SET(Boost_THREAD_LIBRARY_RELEASE libboost_thread)
SET(Boost_INCLUDE_DIRS ${TPDIST}/include)
SET(Boost_LIBRARY_DIRS ${TPDIST}/lib)
MESSAGE(STATUS ${Boost_DATE_TIME_LIBRARY})
LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
SET(Boost_DATE_TIME_LIBRARY libboost_date_time)
SET(Boost_DATE_TIME_LIBRARY_DEBUG libboost_date_time)
SET(Boost_DATE_TIME_LIBRARY_RELEASE libboost_date_time)
SET(Boost_FILESYSTEM_LIBRARY libboost_filesystem)
SET(Boost_FILESYSTEM_LIBRARY_DEBUG libboost_filesystem)
SET(Boost_FILESYSTEM_LIBRARY_RELEASE libboost_filesystem)
SET(Boost_IOSTREAMS_LIBRARY libboost_iostreams)
SET(Boost_IOSTREAMS_LIBRARY_DEBUG libboost_iostreams)
SET(Boost_IOSTREAMS_LIBRARY_RELEASE libboost_iostreams)
SET(Boost_PROGRAM_OPTIONS_LIBRARY libboost_program_options)
SET(Boost_PROGRAM_OPTIONS_LIBRARY_DEBUG libboost_program_options)
SET(Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE libboost_program_options)
SET(Boost_REGEX_LIBRARY libboost_regex)
SET(Boost_REGEX_LIBRARY_DEBUG libboost_regex)
SET(Boost_REGEX_LIBRARY_RELEASE libboost_regex)
SET(Boost_SYSTEM_LIBRARY libboost_system)
SET(Boost_SYSTEM_LIBRARY_DEBUG libboost_system)
SET(Boost_SYSTEM_LIBRARY_RELEASE libboost_system)
SET(Boost_THREAD_LIBRARY libboost_thread)
SET(Boost_THREAD_LIBRARY_DEBUG libboost_thread)
SET(Boost_THREAD_LIBRARY_RELEASE libboost_thread)
SET(Boost_INCLUDE_DIRS ${TPDIST}/include)
SET(Boost_LIBRARY_DIRS ${TPDIST}/lib)
MESSAGE(STATUS ${Boost_DATE_TIME_LIBRARY})
LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
ELSE()
SET(Boost_DATE_TIME_LIBRARY boost_date_time)
SET(Boost_DATE_TIME_LIBRARY_DEBUG boost_date_time)
SET(Boost_DATE_TIME_LIBRARY_RELEASE boost_date_time)
SET(Boost_FILESYSTEM_LIBRARY boost_filesystem)
SET(Boost_FILESYSTEM_LIBRARY_DEBUG boost_filesystem)
SET(Boost_FILESYSTEM_LIBRARY_RELEASE boost_filesystem)
SET(Boost_IOSTREAMS_LIBRARY boost_iostreams)
SET(Boost_IOSTREAMS_LIBRARY_DEBUG boost_iostreams)
SET(Boost_IOSTREAMS_LIBRARY_RELEASE boost_iostreams)
SET(Boost_PROGRAM_OPTIONS_LIBRARY boost_program_options)
SET(Boost_PROGRAM_OPTIONS_LIBRARY_DEBUG boost_program_options)
SET(Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE boost_program_options)
SET(Boost_REGEX_LIBRARY boost_regex)
SET(Boost_REGEX_LIBRARY_DEBUG boost_regex)
SET(Boost_REGEX_LIBRARY_RELEASE boost_regex)
SET(Boost_SYSTEM_LIBRARY boost_system)
SET(Boost_SYSTEM_LIBRARY_DEBUG boost_system)
SET(Boost_SYSTEM_LIBRARY_RELEASE boost_system)
SET(Boost_THREAD_LIBRARY boost_thread)
SET(Boost_THREAD_LIBRARY_DEBUG boost_thread)
SET(Boost_THREAD_LIBRARY_RELEASE boost_thread)
SET(Boost_INCLUDE_DIRS ${TPSRC}/dist/include
${TPSRC}/dist/include/boost-1_49)
SET(Boost_LIBRARY_DIRS ${TPSRC}/dist/lib)
LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
SET(Boost_DATE_TIME_LIBRARY boost_date_time)
SET(Boost_DATE_TIME_LIBRARY_DEBUG boost_date_time)
SET(Boost_DATE_TIME_LIBRARY_RELEASE boost_date_time)
SET(Boost_FILESYSTEM_LIBRARY boost_filesystem)
SET(Boost_FILESYSTEM_LIBRARY_DEBUG boost_filesystem)
SET(Boost_FILESYSTEM_LIBRARY_RELEASE boost_filesystem)
SET(Boost_IOSTREAMS_LIBRARY boost_iostreams)
SET(Boost_IOSTREAMS_LIBRARY_DEBUG boost_iostreams)
SET(Boost_IOSTREAMS_LIBRARY_RELEASE boost_iostreams)
SET(Boost_PROGRAM_OPTIONS_LIBRARY boost_program_options)
SET(Boost_PROGRAM_OPTIONS_LIBRARY_DEBUG boost_program_options)
SET(Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE boost_program_options)
SET(Boost_REGEX_LIBRARY boost_regex)
SET(Boost_REGEX_LIBRARY_DEBUG boost_regex)
SET(Boost_REGEX_LIBRARY_RELEASE boost_regex)
SET(Boost_SYSTEM_LIBRARY boost_system)
SET(Boost_SYSTEM_LIBRARY_DEBUG boost_system)
SET(Boost_SYSTEM_LIBRARY_RELEASE boost_system)
SET(Boost_THREAD_LIBRARY boost_thread)
SET(Boost_THREAD_LIBRARY_DEBUG boost_thread)
SET(Boost_THREAD_LIBRARY_RELEASE boost_thread)
SET(Boost_INCLUDE_DIRS ${TPSRC}/dist/include
${TPSRC}/dist/include/boost-1_49)
SET(Boost_LIBRARY_DIRS ${TPSRC}/dist/lib)
LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
ENDIF()
ELSE (THIRDPARTY_BUILD_BOOST)
ADD_CUSTOM_TARGET(boost ALL)
......@@ -160,8 +160,8 @@ ELSE (THIRDPARTY_BUILD_BOOST)
FIND_PACKAGE( Boost QUIET COMPONENTS thread iostreams date_time
filesystem system program_options regex )
ELSE ()
SET(BOOST_ROOT ${TPDIST})
FIND_PACKAGE( Boost QUIET COMPONENTS thread iostreams date_time filesystem system program_options regex)
SET(BOOST_ROOT ${TPDIST})
FIND_PACKAGE( Boost QUIET COMPONENTS thread iostreams date_time filesystem system program_options regex)
ENDIF()
ELSE()
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment