Fix CMake tests in .travis.yml

Update CMakeLists.txt
Merge branch 'master' into develop
2021-06-10 16:37:10 +03:00 · 2021-06-10 02:09:03 +03:00 · 2021-06-10 02:07:17 +03:00 · 2021-02-15 16:07:36 -05:00 · 2020-12-29 16:26:32 -05:00 · 2020-10-25 06:16:15 -04:00
2 changed files with 5 additions and 10 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -302,8 +302,9 @@ matrix:
      env: CMAKE_TEST=1
      script:
        - mkdir __build__ && cd __build__
-        - cmake -DBOOST_ENABLE_CMAKE=1 -DBoost_VERBOSE=1 -DBOOST_INCLUDE_LIBRARIES=preprocessor ..
-        - ctest --output-on-failure -R boost_preprocessor
+        - cmake -DBUILD_TESTING=ON -DBOOST_INCLUDE_LIBRARIES=preprocessor ..
+        - cmake --build . --target tests
+        - ctest --output-on-failure

    - os: linux
      env: CMAKE_SUBDIR_TEST=1
@ -317,8 +318,9 @@ matrix:
    - os: linux
      env: CMAKE_INSTALL_TEST=1
      script:
+        - pip install --user cmake
        - 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
        - cd ../libs/preprocessor/test/cmake_install_test && mkdir __build__ && cd __build__
        - cmake -DCMAKE_INSTALL_PREFIX=~/.local ..
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -11,13 +11,6 @@ add_library(Boost::preprocessor ALIAS boost_preprocessor)

 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)

  add_subdirectory(test)
Author	SHA1	Message	Date
Peter Dimov	69614bb1da	Fix CMake tests in .travis.yml	2021-06-10 16:37:10 +03:00
Peter Dimov	24abbdc906	Update CMakeLists.txt	2021-06-10 02:09:03 +03:00
Peter Dimov	45178c3cc5	Merge branch 'master' into develop	2021-06-10 02:07:17 +03:00
Edward Diener	229f654b59	Merge branch 'develop'	2021-02-15 16:07:36 -05:00
Edward Diener	b49e14231f	Merge branch 'develop'	2020-12-29 16:26:32 -05:00
Edward Diener	5e17804af2	Merge branch 'develop'	2020-10-25 06:16:15 -04:00
Edward Diener	ae5e475169	Merge branch 'develop'	2020-10-24 20:35:07 -04:00
Edward Diener	2c20e742a1	Merge branch 'develop' into master	2020-08-14 19:42:33 -04:00
Edward Diener	e4fb5f4866	Merge branch 'develop'	2020-03-01 00:18:20 -05:00
Edward Diener	e4ce0f06f5	Merge branch 'develop'	2020-02-01 23:12:13 -05:00
Edward Diener	ffb27a1d56	Merge branch 'develop'	2019-11-12 15:01:45 -05:00
Edward Diener	e7256313c4	Merge branch 'develop'	2019-11-03 23:32:49 -05:00
Edward Diener	6db241a78d	Merge remote-tracking branch 'remotes/origin/develop'	2019-10-20 17:03:23 -04:00
Edward Diener	291f92696d	Merge branch 'develop'	2019-10-09 12:48:38 -04:00
Edward Diener	6af29d8b77	Merge branch 'develop'	2019-10-04 22:51:14 -04:00
Edward Diener	d135cad759	Merge branch 'develop'	2018-10-25 19:41:15 -04:00
Edward Diener	56090c56b5	Merge branch 'develop'	2018-02-20 09:13:57 -05:00
eldiener	39175c471f	Merge branch 'develop'	2017-10-30 11:32:10 -04:00
eldiener	50ffeeee8b	Merge branch 'develop'	2017-10-27 22:31:37 -04:00
Edward Diener	b19e4deacb	Merge branch 'develop'	2017-04-24 12:13:09 -04:00
Edward Diener	a6275942f3	Merge branch 'develop'	2017-02-19 03:21:26 -05:00
Edward Diener	075a3a02c8	Merge branch 'develop'	2017-01-04 11:29:41 -05:00
Edward Diener	c2beb74b90	Updated for VC++ quirks and overload code example.	2016-04-14 08:52:06 -04:00