Compare commits

..

3 Commits

Author SHA1 Message Date
69614bb1da Fix CMake tests in .travis.yml 2021-06-10 16:37:10 +03:00
24abbdc906 Update CMakeLists.txt 2021-06-10 02:09:03 +03:00
45178c3cc5 Merge branch 'master' into develop 2021-06-10 02:07:17 +03:00
2 changed files with 5 additions and 10 deletions

View File

@ -302,8 +302,9 @@ matrix:
env: CMAKE_TEST=1 env: CMAKE_TEST=1
script: script:
- mkdir __build__ && cd __build__ - mkdir __build__ && cd __build__
- cmake -DBOOST_ENABLE_CMAKE=1 -DBoost_VERBOSE=1 -DBOOST_INCLUDE_LIBRARIES=preprocessor .. - cmake -DBUILD_TESTING=ON -DBOOST_INCLUDE_LIBRARIES=preprocessor ..
- ctest --output-on-failure -R boost_preprocessor - cmake --build . --target tests
- ctest --output-on-failure
- os: linux - os: linux
env: CMAKE_SUBDIR_TEST=1 env: CMAKE_SUBDIR_TEST=1
@ -317,8 +318,9 @@ matrix:
- os: linux - os: linux
env: CMAKE_INSTALL_TEST=1 env: CMAKE_INSTALL_TEST=1
script: script:
- pip install --user cmake
- mkdir __build__ && cd __build__ - mkdir __build__ && cd __build__
- cmake -DBOOST_ENABLE_CMAKE=1 -DBoost_VERBOSE=1 -DBOOST_INCLUDE_LIBRARIES=preprocessor -DCMAKE_INSTALL_PREFIX=~/.local .. - cmake -DBOOST_INCLUDE_LIBRARIES=preprocessor -DCMAKE_INSTALL_PREFIX=~/.local ..
- cmake --build . --target install - cmake --build . --target install
- cd ../libs/preprocessor/test/cmake_install_test && mkdir __build__ && cd __build__ - cd ../libs/preprocessor/test/cmake_install_test && mkdir __build__ && cd __build__
- cmake -DCMAKE_INSTALL_PREFIX=~/.local .. - cmake -DCMAKE_INSTALL_PREFIX=~/.local ..

View File

@ -11,13 +11,6 @@ add_library(Boost::preprocessor ALIAS boost_preprocessor)
target_include_directories(boost_preprocessor INTERFACE include) target_include_directories(boost_preprocessor INTERFACE include)
if(BOOST_SUPERPROJECT_VERSION)
include(BoostInstall)
boost_install(TARGETS boost_preprocessor HEADER_DIRECTORY include/)
endif()
if(BUILD_TESTING) if(BUILD_TESTING)
add_subdirectory(test) add_subdirectory(test)