Fix CMake tests in .travis.yml

.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 ..

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)

test/CMakeLists.txt

@@ -11,8 +11,9 @@ endif()
 enable_language(C)
 
 set(tests_common arithmetic array comparison control debug facilities list logical punctuation selection seq slot stringize tuple variadic isempty)
+set(tests_common_fail isempty_variadic_standard_failure isempty_variadic_standard_failure2)
 set(tests_c ${tests_common})
-set(tests_cpp ${tests_common} iteration repetition quick)
+set(tests_cpp ${tests_common} iteration repetition checkempty vaopt quick)
 
 set(BOOST_TEST_LINK_LIBRARIES Boost::preprocessor)
 
@@ -21,13 +22,20 @@ include_directories(../../..) # for `include <libs/preprocessor/...>` to work
 foreach(test IN LISTS tests_c)
 
   boost_test(TYPE compile SOURCES ${test}.c)
-  boost_test(TYPE compile NAME ${test}_c_nvm SOURCES ${test}.c COMPILE_DEFINITIONS BOOST_PP_VARIADICS=0)
 
 endforeach()
 
 foreach(test IN LISTS tests_cpp)
 
   boost_test(TYPE compile SOURCES ${test}.cpp)
-  boost_test(TYPE compile NAME ${test}_cpp_nvm SOURCES ${test}.cpp COMPILE_DEFINITIONS BOOST_PP_VARIADICS=0)
 
 endforeach()
+
+foreach(test IN LISTS tests_common_fail)
+
+  boost_test(TYPE compile-fail SOURCES ${test}.c)
+  boost_test(TYPE compile-fail SOURCES ${test}.cpp)
+
+endforeach()
+
+boost_test(TYPE run SOURCES config_info.cpp)