Merge pull request #16 from igaztanaga/patch-1

Small fix for Wsign-conversion
2025-07-14 21:26:34 +02:00 · 2021-10-13 16:03:23 +01:00 · 2021-10-13 15:10:36 +02:00 · 2021-06-10 16:34:02 +03:00 · 2021-06-10 02:06:15 +03:00 · 2021-01-21 18:01:26 +00:00
13 changed files with 318 additions and 199 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,21 +1,16 @@
-# Copyright 2016, 2017 Peter Dimov
+# Copyright 2016-2019 Peter Dimov
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)

 language: cpp

-sudo: false
-
-python: "2.7"
-
-os:
-  - linux
-  - osx
+dist: xenial

 branches:
  only:
    - master
    - develop
+    - /feature\/.*/

 env:
  matrix:
@ -28,10 +23,32 @@ matrix:

  include:
    - os: linux
-      env: TOOLSET=gcc COMPILER=g++ CXXSTD=c++03
+      compiler: g++
+      env: TOOLSET=gcc COMPILER=g++ CXXSTD=03,11

    - os: linux
-      env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=c++03
+      compiler: g++-4.4
+      env: TOOLSET=gcc COMPILER=g++-4.4 CXXSTD=98
+      addons:
+        apt:
+          packages:
+            - g++-4.4
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      compiler: g++-4.6
+      env: TOOLSET=gcc COMPILER=g++-4.6 CXXSTD=03,0x
+      addons:
+        apt:
+          packages:
+            - g++-4.6
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      compiler: g++-4.7
+      env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=03,11
      addons:
        apt:
          packages:
@ -40,34 +57,17 @@ matrix:
            - ubuntu-toolchain-r-test

    - os: linux
-      env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=c++11
-      addons:
-        apt:
-          packages:
-            - g++-4.7
-          sources:
-            - ubuntu-toolchain-r-test
-
-    - os: linux
-      env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=c++03
+      compiler: g++-4.8
+      env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=03,11
      addons:
        apt:
          packages:
            - g++-4.8
          sources:
            - ubuntu-toolchain-r-test
-
    - os: linux
-      env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=c++11
-      addons:
-        apt:
-          packages:
-            - g++-4.8
-          sources:
-            - ubuntu-toolchain-r-test
-
-    - os: linux
-      env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=c++03
+      compiler: g++-4.9
+      env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=03,11
      addons:
        apt:
          packages:
@ -76,16 +76,8 @@ matrix:
            - ubuntu-toolchain-r-test

    - os: linux
-      env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=c++11
-      addons:
-        apt:
-          packages:
-            - g++-4.9
-          sources:
-            - ubuntu-toolchain-r-test
-
-    - os: linux
-      env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++03
+      compiler: g++-5
+      env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=03,11,14,1z
      addons:
        apt:
          packages:
@ -94,25 +86,8 @@ matrix:
            - ubuntu-toolchain-r-test

    - os: linux
-      env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++11
-      addons:
-        apt:
-          packages:
-            - g++-5
-          sources:
-            - ubuntu-toolchain-r-test
-
-    - os: linux
-      env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++14
-      addons:
-        apt:
-          packages:
-            - g++-5
-          sources:
-            - ubuntu-toolchain-r-test
-
-    - os: linux
-      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++03
+      compiler: g++-6
+      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=03,11,14,1z
      addons:
        apt:
          packages:
@ -121,196 +96,221 @@ matrix:
            - ubuntu-toolchain-r-test

    - os: linux
-      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++11
+      dist: trusty
+      compiler: g++-7
+      env: TOOLSET=gcc COMPILER=g++-7 CXXSTD=03,11,14,17
      addons:
        apt:
          packages:
-            - g++-6
+            - g++-7
          sources:
            - ubuntu-toolchain-r-test

    - os: linux
-      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++14
+      compiler: g++-8
+      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=03,11,14,17,2a
      addons:
        apt:
          packages:
-            - g++-6
+            - g++-8
          sources:
            - ubuntu-toolchain-r-test

    - os: linux
-      env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++1z
+      compiler: g++-9
+      env: TOOLSET=gcc COMPILER=g++-9 CXXSTD=03,11,14,17,2a
      addons:
        apt:
          packages:
-            - g++-6
+            - g++-9
          sources:
            - ubuntu-toolchain-r-test

    - os: linux
-      env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++03
+      compiler: clang++
+      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11

    - os: linux
-      env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++11
+      dist: trusty
+      compiler: /usr/bin/clang++
+      env: TOOLSET=clang COMPILER=/usr/bin/clang++ CXXSTD=03,11
+      addons:
+        apt:
+          packages:
+            - clang-3.3

    - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=c++03
+      dist: trusty
+      compiler: /usr/bin/clang++
+      env: TOOLSET=clang COMPILER=/usr/bin/clang++ CXXSTD=03,11
+      addons:
+        apt:
+          packages:
+            - clang-3.4
+
+    - os: linux
+      compiler: clang++-3.5
+      env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=03,11,14,1z
      addons:
        apt:
          packages:
            - clang-3.5
          sources:
            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.5

    - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=c++11
-      addons:
-        apt:
-          packages:
-            - clang-3.5
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.5
-
-    - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=c++03
+      compiler: clang++-3.6
+      env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=03,11,14,1z
      addons:
        apt:
          packages:
            - clang-3.6
          sources:
            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.6

    - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=c++11
-      addons:
-        apt:
-          packages:
-            - clang-3.6
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.6
-
-    - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=c++03
+      compiler: clang++-3.7
+      env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=03,11,14,1z
      addons:
        apt:
          packages:
            - clang-3.7
          sources:
            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.7

    - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=c++11
-      addons:
-        apt:
-          packages:
-            - clang-3.7
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.7
-
-    - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++03
+      compiler: clang++-3.8
+      env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=03,11,14,1z
      addons:
        apt:
          packages:
            - clang-3.8
          sources:
            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.8

    - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++11
-      addons:
-        apt:
-          packages:
-            - clang-3.8
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.8
-
-    - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++14
-      addons:
-        apt:
-          packages:
-            - clang-3.8
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.8
-
-    - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++1z
-      addons:
-        apt:
-          packages:
-            - clang-3.8
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.8
-
-    - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=c++03
+      compiler: clang++-3.9
+      env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=03,11,14,1z
      addons:
        apt:
          packages:
            - clang-3.9
          sources:
            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.9

    - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=c++11
+      compiler: clang++-4.0
+      env: TOOLSET=clang COMPILER=clang++-4.0 CXXSTD=03,11,14,1z
      addons:
        apt:
          packages:
-            - clang-3.9
+            - clang-4.0
          sources:
            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.9

    - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=c++14
+      compiler: clang++-5.0
+      env: TOOLSET=clang COMPILER=clang++-5.0 CXXSTD=03,11,14,1z
      addons:
        apt:
          packages:
-            - clang-3.9
+            - clang-5.0
          sources:
            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.9

    - os: linux
-      env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=c++1z
+      compiler: clang++-6.0
+      env: TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=03,11,14,17,2a
      addons:
        apt:
          packages:
-            - clang-3.9
+            - clang-6.0
          sources:
            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.9
+
+    - os: linux
+      compiler: clang++-7
+      env: TOOLSET=clang COMPILER=clang++-7 CXXSTD=03,11,14,17,2a
+      addons:
+        apt:
+          packages:
+            - clang-7
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-xenial-7
+
+    - os: linux
+      compiler: clang++-8
+      env: TOOLSET=clang COMPILER=clang++-8 CXXSTD=03,11,14,17,2a
+      addons:
+        apt:
+          packages:
+            - clang-8
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-xenial-8
+
+    - os: linux
+      compiler: clang++-9
+      env: TOOLSET=clang COMPILER=clang++-9 CXXSTD=03,11,14,17,2a
+      addons:
+        apt:
+          packages:
+            - clang-9
+          sources:
+            - ubuntu-toolchain-r-test
+            - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main'
+              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
+
+    - os: linux
+      dist: trusty
+      compiler: clang++-libc++
+      env: TOOLSET=clang COMPILER=clang++-libc++ CXXSTD=03,11,14,1z
+      addons:
+        apt:
+          packages:
+            - libc++-dev
+
+    - os: linux
+      env: CMAKE=1
+      script:
+        - mkdir __build__ && cd __build__
+        - cmake -DBUILD_TESTING=ON -DBOOST_INCLUDE_LIBRARIES=static_assert ..
+        - cmake --build . --target tests
+        - ctest --output-on-failure
+
+    - os: linux
+      env: CMAKE_SUBDIR=1
+      install:
+        - BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true
+        - git clone -b $BOOST_BRANCH https://github.com/boostorg/config.git ../config
+      script:
+        - cd test/cmake_subdir_test && mkdir __build__ && cd __build__
+        - cmake ..
+        - cmake --build .
+        - cmake --build . --target check
+
+    - os: linux
+      env: CMAKE_INSTALL=1
+      script:
+        - pip install --user cmake
+        - mkdir __build__ && cd __build__
+        - cmake -DBOOST_INCLUDE_LIBRARIES=static_assert -DCMAKE_INSTALL_PREFIX=~/.local ..
+        - cmake --build . --target install
+        - cd ../libs/static_assert/test/cmake_install_test && mkdir __build__ && cd __build__
+        - cmake -DCMAKE_INSTALL_PREFIX=~/.local ..
+        - cmake --build .
+        - cmake --build . --target check

    - os: osx
-      env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++03
-
-    - os: osx
-      env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++11
-
-    - os: osx
-      env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14
-
-    - os: osx
-      env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++1z
+      compiler: clang++
+      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z

 install:
+  - BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true
  - cd ..
-  - git clone -b $TRAVIS_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
+  - git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
  - cd boost-root
-  - git submodule update --init tools/build
-  - git submodule update --init libs/config
  - git submodule update --init tools/boostdep
  - cp -r $TRAVIS_BUILD_DIR/* libs/static_assert
  - python tools/boostdep/depinst/depinst.py static_assert
@ -319,8 +319,8 @@ install:

 script:
  - |-
-    echo "using $TOOLSET : : $COMPILER : <cxxflags>-std=$CXXSTD ;" > ~/user-config.jam
-  - ./b2 libs/static_assert/test toolset=$TOOLSET
+    echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam
+  - ./b2 -j 3 libs/static_assert/test toolset=$TOOLSET cxxstd=$CXXSTD

 notifications:
  email:
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -0,0 +1,28 @@
+# Copyright 2018 Mike Dev
+# Copyright 2019 Peter Dimov
+# Distributed under the Boost Software License, Version 1.0.
+# See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt
+
+# We support CMake 3.5, but prefer 3.16 policies and behavior
+cmake_minimum_required(VERSION 3.5...3.16)
+
+project(boost_static_assert VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX)
+
+add_library(boost_static_assert INTERFACE)
+add_library(Boost::static_assert ALIAS boost_static_assert)
+
+target_include_directories(boost_static_assert INTERFACE include)
+
+target_link_libraries(boost_static_assert
+  INTERFACE
+    Boost::config
+)
+
+# BUILD_TESTING is the standard CTest variable that enables testing
+
+if(BUILD_TESTING)
+
+  add_subdirectory(test)
+  add_subdirectory(example)
+
+endif()
--- a/README.md
+++ b/README.md
@ -0,0 +1,36 @@
+Boost StaticAssert Library
+============================
+
+The Boost StaticAssert library provides static assertions for C++, this library is the ancestor to C++ native static_assert's and 
+can be used on older compilers which don't have that feature.
+
+The full documentation is available on [boost.org](http://www.boost.org/doc/libs/release/libs/static_assert).
+
+## Support, bugs and feature requests ##
+
+Bugs and feature requests can be reported through the [Gitub issue tracker](https://github.com/boostorg/static_assert/issues)
+(see [open issues](https://github.com/boostorg/static_assert/issues) and
+[closed issues](https://github.com/boostorg/static_assert/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aclosed)).
+
+You can submit your changes through a [pull request](https://github.com/boostorg/static_assert/pulls).
+
+There is no mailing-list specific to Boost StaticAssert, although you can use the general-purpose Boost [mailing-list](http://lists.boost.org/mailman/listinfo.cgi/boost-users) using the tag [static_assert].
+
+
+## Development ##
+
+Clone the whole boost project, which includes the individual Boost projects as submodules ([see boost+git doc](https://github.com/boostorg/boost/wiki/Getting-Started)): 
+
+    git clone https://github.com/boostorg/boost
+    cd boost
+    git submodule update --init
+
+The Boost StaticAssert Library is located in `libs/static_assert/`. 
+
+### Running tests ###
+First, make sure you are in `libs/static_assert/test`. 
+You can either run all the tests listed in `Jamfile.v2` or run a single test:
+
+    ../../../b2                        <- run all tests
+    ../../../b2 static_assert_test     <- single test
+
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@ -0,0 +1,11 @@
+# Copyright 2018, 2019 Peter Dimov
+# Distributed under the Boost Software License, Version 1.0.
+# See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt
+
+include(BoostTestJamfile OPTIONAL RESULT_VARIABLE HAVE_BOOST_TEST)
+
+if(HAVE_BOOST_TEST)
+
+boost_test_jamfile(FILE Jamfile.v2 LINK_LIBRARIES Boost::static_assert Boost::type_traits)
+
+endif()
--- a/example/Jamfile.v2
+++ b/example/Jamfile.v2
@ -6,15 +6,6 @@
 # bring in the rules for testing
 import testing ;

-test-suite static_assert :
-#	[ run static_assert_example_1.cpp ]
-	[ run static_assert_example_2.cpp ]
-	[ run static_assert_example_3.cpp ]
-;
-
-
-
-
-
-
-
+#run static_assert_example_1.cpp ;
+run static_assert_example_2.cpp ;
+run static_assert_example_3.cpp ;
--- a/include/boost/static_assert.hpp
+++ b/include/boost/static_assert.hpp
@ -16,6 +16,7 @@

 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
+#include <cstddef> //for std::size_t

 #if defined(__GNUC__) && !defined(__GXX_EXPERIMENTAL_CXX0X__)
 //
@ -36,7 +37,7 @@
 #     define BOOST_STATIC_ASSERT_MSG( B, Msg ) BOOST_STATIC_ASSERT( B )
 #endif

-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 //
 // workaround for buggy integral-constant expression support:
 #define BOOST_BUGGY_INTEGRAL_CONSTANT_EXPRESSIONS
@ -53,9 +54,9 @@
 //
 #if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4)))
 #  ifndef BOOST_NO_CXX11_VARIADIC_MACROS
-#     define BOOST_STATIC_ASSERT_BOOL_CAST( ... ) ((__VA_ARGS__) == 0 ? false : true)
+#     define BOOST_STATIC_ASSERT_BOOL_CAST( ... ) ((__VA_ARGS__) != 0)
 #  else
-#     define BOOST_STATIC_ASSERT_BOOL_CAST( x ) ((x) == 0 ? false : true)
+#     define BOOST_STATIC_ASSERT_BOOL_CAST( x ) ((x) != 0)
 #  endif
 #else
 #  ifndef BOOST_NO_CXX11_VARIADIC_MACROS
@ -81,7 +82,7 @@ template <bool x> struct STATIC_ASSERTION_FAILURE;
 template <> struct STATIC_ASSERTION_FAILURE<true> { enum { value = 1 }; };

 // HP aCC cannot deal with missing names for template value parameters
-template<int x> struct static_assert_test{};
+template<std::size_t x> struct static_assert_test{};

 }

--- a/meta/libraries.json
+++ b/meta/libraries.json
@ -12,5 +12,6 @@
    ],
    "maintainers": [
        "John Maddock <john -at- johnmaddock.co.uk>"
-    ]
+    ],
+    "cxxstd": "03"
 }
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@ -0,0 +1,11 @@
+# Copyright 2018, 2019 Peter Dimov
+# Distributed under the Boost Software License, Version 1.0.
+# See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt
+
+include(BoostTestJamfile OPTIONAL RESULT_VARIABLE HAVE_BOOST_TEST)
+
+if(HAVE_BOOST_TEST)
+
+boost_test_jamfile(FILE Jamfile.v2 LINK_LIBRARIES Boost::static_assert)
+
+endif()
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@ -6,25 +6,16 @@
 # bring in the rules for testing
 import testing ;

-test-suite static_assert :
-	[ run static_assert_test.cpp ]
-	[ compile-fail static_assert_test_fail_1.cpp ]
-	[ compile-fail static_assert_test_fail_2.cpp ]
-	[ compile-fail static_assert_test_fail_3.cpp ]
-	[ compile-fail static_assert_test_fail_4.cpp ]
-	[ compile-fail static_assert_test_fail_5.cpp ]
-	[ compile-fail static_assert_test_fail_6.cpp ]
-	[ compile-fail static_assert_test_fail_7.cpp ]
-	[ compile-fail static_assert_test_fail_8.cpp ]
-	[ compile-fail static_assert_test_fail_9.cpp ]
-	[ compile-fail static_assert_test_fail_10.cpp ]
-;
+run static_assert_test.cpp ;
+compile-fail static_assert_test_fail_1.cpp ;
+compile-fail static_assert_test_fail_2.cpp ;
+compile-fail static_assert_test_fail_3.cpp ;
+compile-fail static_assert_test_fail_4.cpp ;
+compile-fail static_assert_test_fail_5.cpp ;
+compile-fail static_assert_test_fail_6.cpp ;
+compile-fail static_assert_test_fail_7.cpp ;
+compile-fail static_assert_test_fail_8.cpp ;
+compile-fail static_assert_test_fail_9.cpp ;
+compile-fail static_assert_test_fail_10.cpp ;

 build-project ../example ;
-
-
-
-
-
-
-
--- a/test/cmake_install_test/CMakeLists.txt
+++ b/test/cmake_install_test/CMakeLists.txt
@ -0,0 +1,17 @@
+# Copyright 2018, 2019 Peter Dimov
+# Distributed under the Boost Software License, Version 1.0.
+# See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt
+
+cmake_minimum_required(VERSION 3.5...3.16)
+
+project(cmake_install_test LANGUAGES CXX)
+
+find_package(boost_static_assert REQUIRED)
+
+add_executable(main main.cpp)
+target_link_libraries(main Boost::static_assert)
+
+enable_testing()
+add_test(NAME main COMMAND main)
+
+add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)
--- a/test/cmake_install_test/main.cpp
+++ b/test/cmake_install_test/main.cpp
@ -0,0 +1,7 @@
+#include <boost/static_assert.hpp>
+
+int main()
+{
+    int const x = 5;
+    BOOST_STATIC_ASSERT( x > 4 );
+}
--- a/test/cmake_subdir_test/CMakeLists.txt
+++ b/test/cmake_subdir_test/CMakeLists.txt
@ -0,0 +1,18 @@
+# Copyright 2018, 2019 Peter Dimov
+# Distributed under the Boost Software License, Version 1.0.
+# See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt
+
+cmake_minimum_required(VERSION 3.5...3.16)
+
+project(cmake_subdir_test LANGUAGES CXX)
+
+add_subdirectory(../../../static_assert boostorg/static_assert)
+add_subdirectory(../../../config boostorg/config)
+
+add_executable(main main.cpp)
+target_link_libraries(main Boost::static_assert)
+
+enable_testing()
+add_test(NAME main COMMAND main)
+
+add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)
--- a/test/cmake_subdir_test/main.cpp
+++ b/test/cmake_subdir_test/main.cpp
@ -0,0 +1,7 @@
+#include <boost/static_assert.hpp>
+
+int main()
+{
+    int const x = 5;
+    BOOST_STATIC_ASSERT( x > 4 );
+}
Author	SHA1	Message	Date
jzmaddock	ba72d3340f	Merge pull request #16 from igaztanaga/patch-1 Small fix for Wsign-conversion	2021-10-13 16:03:23 +01:00
Ion Gaztañaga	803b983da7	Small fix for Wsign-conversion	2021-10-13 15:10:36 +02:00
Peter Dimov	392199f6b1	Fix CMake tests in .travis.yml	2021-06-10 16:34:02 +03:00
Peter Dimov	482e81cddd	Update CMakeLists.txt	2021-06-10 02:06:15 +03:00
jzmaddock	66db74297a	Merge pull request #13 from eldiener/develop [skip ci] Add "cxxstd" json field	2021-01-21 18:01:26 +00:00
Edward Diener	e9ab97859d	[skip ci] Add "cxxstd" json field. The "cxxstd" json field is being added to each Boost library's meta json information for libraries in order to specify the minumum C++ standard compilation level. The value of this field matches one of the values for 'cxxstd' in Boost.Build. The purpose of doing this is to provide information for the Boost website documentation for each library which will specify the minimum C++ standard compilation that an end-user must employ in order to use the particular library. This will aid end-users who want to know if they can successfully use a Boost library based on their C++ compiler's compilation level, without having to search the library's documentation to find this out.	2021-01-21 11:09:31 -05:00
jzmaddock	073c482606	Merge pull request #11 from eldiener/develop Changes for Embarcadero C++ clang-based compilers, targeting Boost 1.74. Use BOOST_BORLANDC for bcc32 compiler	2020-05-06 17:34:09 +01:00
Edward Diener	8ab850a342	Use BOOST_BORLANDC for bcc32 compiler	2020-03-21 22:24:50 -04:00
Peter Dimov	9102d74933	Merge branch 'develop' into feature/add-cmake-tests	2020-01-06 20:11:01 +02:00
Peter Dimov	ba846a3091	Update .travis.yml	2020-01-06 17:22:07 +02:00
Peter Dimov	0277552ae2	Merge branch 'develop'	2020-01-06 15:45:37 +02:00
Peter Dimov	317f01fc58	Merge branch 'develop' into feature/add-cmake-tests	2019-12-29 20:06:15 +02:00
Peter Dimov	b57860c33f	Use -DBOOST_INCLUDE_LIBRARIES=static_assert	2019-12-29 19:34:08 +02:00
Peter Dimov	ca94dbbc1a	Use Boost_VERBOSE instead of Boost_DEBUG	2019-12-29 18:52:09 +02:00
Peter Dimov	0a775cf1c5	Untabify	2019-12-29 18:47:06 +02:00
Peter Dimov	eac11c5e50	Merge pull request #9 from boostorg/pr/add-cmake-install Add CMake install support (needed by type_traits)	2019-12-28 09:49:16 -08:00
Peter Dimov	944702b862	Add comment	2019-12-27 06:04:16 +02:00
Peter Dimov	1aaabeb02b	Fix indentation	2019-12-27 04:28:29 +02:00
Peter Dimov	9064caf95f	Merge branch 'pr/add-cmake-install' into feature/add-cmake-tests	2019-12-27 04:24:37 +02:00
Peter Dimov	f970afff9d	Disable installation without the superproject; add comments	2019-12-27 04:22:53 +02:00
Peter Dimov	ad48daf3b2	Change LIBRARIES to LINK_LIBRARIES	2019-12-27 04:20:36 +02:00
Peter Dimov	c6b558f1f2	Fix branch handling; add -j3 to `b2 test`	2019-12-27 03:32:34 +02:00
Peter Dimov	00724b8429	Fix .travis.yml typos; enable feature/* testing	2019-12-27 03:29:28 +02:00
Peter Dimov	00a741184c	Add cmake_install_test, cmake_subdir_test	2019-12-26 19:05:07 +02:00
Peter Dimov	f000d27cb2	Add CMake testing job to Travis	2019-12-26 19:00:25 +02:00
Peter Dimov	a8597c46d5	Add CMake testing support	2019-12-26 18:58:11 +02:00
Peter Dimov	609a5c0cd1	Add CMake install support (needed by type_traits)	2019-12-26 17:16:45 +02:00
John Maddock	233ef6bedd	Merge branch 'develop'	2019-02-27 18:28:11 +00:00
jzmaddock	cb6d8fe37d	Merge pull request #7 from LukeCz/patch-1 Simplified boolean expression	2019-02-27 18:07:02 +00:00
Lukasz Czajczyk	23ee2b94b5	Simplified boolean expression	2019-01-21 16:50:00 -06:00
jzmaddock	cffc57ffba	Merge branch 'develop'	2019-01-16 18:19:43 +00:00
jzmaddock	488af9cf1b	add README.md [CI SKIP]	2018-10-15 18:12:54 +01:00
jzmaddock	a2c81d05e5	Merge pull request #6 from Mike-Devel/min_cmake [CMake] Generate cmake target that other libraries can use	2018-10-06 18:32:21 +01:00
Mike Dev	68e4213583	[CMake] Generate cmake target that other libraries can use ... to express their dependency on this library and retrieve any configuration information such as the include directory, binary to link to (if any), transitive dependencies, necessary compiler options or the required c++ standards level.	2018-10-01 10:41:48 +02:00