allow config file interpolation

This commit is contained in:
Radovan Bast
2015-10-04 23:08:31 +02:00
parent 5890d462fe
commit a823e300f6
14 changed files with 71 additions and 80 deletions

View File

@ -5,12 +5,9 @@ min_cmake_version: 2.8
[cxx]
source: ../../../modules/cxx.cmake
[custom]
source: custom/boost_version-components.cmake
[boost]
defaults: {'major': 1, 'minor': 48, 'patch': 0}
source: ../../../modules/boost/boost.cmake
fetch: http://sourceforge.net/projects/boost/files/boost/1.48.0/boost_1_48_0.zip
[default_build_paths]
source: ../../../modules/default_build_paths.cmake

View File

@ -1,2 +0,0 @@
set(BOOST_MINIMUM_REQUIRED 1.48.0)
list(APPEND BOOST_COMPONENTS_REQUIRED)

View File

@ -5,12 +5,9 @@ min_cmake_version: 2.8
[cxx]
source: ../../../modules/cxx.cmake
[custom]
source: custom/boost_version-components.cmake
[boost]
defaults: {'major': 1, 'minor': 59, 'patch': 0, 'components': 'chrono;timer;system'}
source: ../../../modules/boost/boost.cmake
fetch: http://sourceforge.net/projects/boost/files/boost/1.59.0/boost_1_59_0.zip
[default_build_paths]
source: ../../../modules/default_build_paths.cmake

View File

@ -1,2 +0,0 @@
set(BOOST_MINIMUM_REQUIRED 1.59.0)
list(APPEND BOOST_COMPONENTS_REQUIRED chrono timer system)

View File

@ -1,5 +1,13 @@
add_executable(example example.cpp)
if(BUILD_CUSTOM_BOOST)
add_dependencies(example custom_boost)
endif()
target_link_libraries(example ${Boost_TIMER_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_SYSTEM_LIBRARY})
set(_libs ${Boost_TIMER_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_SYSTEM_LIBRARY})
if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(_libs ${_libs} rt)
endif()
target_link_libraries(example ${_libs})

View File

@ -8,12 +8,9 @@ source: ../../../modules/cxx.cmake
[mpi]
source: ../../../modules/mpi.cmake
[custom]
source: custom/boost_version-components.cmake
[boost]
defaults: {'major': 1, 'minor': 59, 'patch': 0, 'components': 'mpi;serialization'}
source: ../../../modules/boost/boost.cmake
fetch: http://sourceforge.net/projects/boost/files/boost/1.59.0/boost_1_59_0.zip
[default_build_paths]
source: ../../../modules/default_build_paths.cmake

View File

@ -1,2 +0,0 @@
set(BOOST_MINIMUM_REQUIRED 1.59.0)
list(APPEND BOOST_COMPONENTS_REQUIRED mpi serialization)

View File

@ -1,5 +1,7 @@
add_executable(example example.cpp)
if(BUILD_CUSTOM_BOOST)
add_dependencies(example custom_boost)
endif()
target_link_libraries(example ${Boost_MPI_LIBRARY} ${Boost_SERIALIZATION_LIBRARY} ${MPI_CXX_LIBRARIES})

View File

@ -11,12 +11,9 @@ source: ../../../modules/python_interpreter.cmake
[python_libs]
source: ../../../modules/python_libs.cmake
[custom]
source: custom/boost_version-components.cmake
[boost]
defaults: {'major': 1, 'minor': 56, 'patch': 0, 'components': 'python'}
source: ../../../modules/boost/boost.cmake
fetch: http://sourceforge.net/projects/boost/files/boost/1.56.0/boost_1_56_0.zip
[default_build_paths]
source: ../../../modules/default_build_paths.cmake

View File

@ -1,2 +0,0 @@
set(BOOST_MINIMUM_REQUIRED 1.56.0)
list(APPEND BOOST_COMPONENTS_REQUIRED python)

View File

@ -1,5 +1,7 @@
add_executable(example example.cpp)
if(BUILD_CUSTOM_BOOST)
add_dependencies(example custom_boost)
endif()
target_link_libraries(example ${Boost_PYTHON_LIBRARY} ${PYTHON_LIBRARIES})

View File

@ -170,21 +170,17 @@ def test_python_libs_custom():
configure_build_and_exe('python_libs_custom', 'python setup.py --cxx=g++ --python={}'.format(python_executable))
@skip_always
def test_boost_header_only():
configure_build_and_exe('boost_header_only', 'python setup.py --cxx=g++')
@skip_always
def test_boost_libs():
configure_build_and_exe('boost_libs', 'python setup.py --cxx=g++')
@skip_always
def test_boost_mpi_libs():
configure_build_and_exe('boost_mpi_libs', 'python setup.py --cxx=g++ --mpi')
@skip_always
def test_boost_python_libs():
configure_build_and_exe('boost_python_libs', 'python setup.py --cxx=g++')