Remove manual boost_install call from CMakeLists.txt

Merge pull request #16 from eldiener/develop
Changes for Embarcadero C++ clang-based compilers, targeting Boost 1.74
2020-06-14 19:19:43 +03:00 · 2020-05-06 16:35:30 +03:00 · 2020-04-14 00:41:54 +03:00 · 2020-04-08 12:53:23 -04:00 · 2020-03-23 14:35:01 -04:00
3 changed files with 4 additions and 10 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -333,6 +333,7 @@ matrix:
    - os: linux
      env: CMAKE_INSTALL=1
      script:
+        - pip install --user cmake
        - mkdir __build__ && cd __build__
        - cmake -DBOOST_ENABLE_CMAKE=1 -DBoost_VERBOSE=1 -DBOOST_INCLUDE_LIBRARIES=throw_exception -DCMAKE_INSTALL_PREFIX=~/.local ..
        - cmake --build . --target install
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -16,13 +16,6 @@ target_link_libraries(boost_throw_exception
    Boost::config
 )

-if(BOOST_SUPERPROJECT_VERSION)
-
-  include(BoostInstall)
-  boost_install(TARGETS boost_throw_exception HEADER_DIRECTORY include/)
-
-endif()
-
 if(BUILD_TESTING)

  add_subdirectory(test)
--- a/include/boost/throw_exception.hpp
+++ b/include/boost/throw_exception.hpp
@ -25,7 +25,7 @@
 #include <boost/config/workaround.hpp>
 #include <exception>

-#if !defined( BOOST_EXCEPTION_DISABLE ) && defined( __BORLANDC__ ) && BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT(0x593) )
+#if !defined( BOOST_EXCEPTION_DISABLE ) && defined( BOOST_BORLANDC ) && BOOST_WORKAROUND( BOOST_BORLANDC, BOOST_TESTED_AT(0x593) )
 # define BOOST_EXCEPTION_DISABLE
 #endif

@ -140,7 +140,7 @@ public:
        set_info( *this, throw_function( loc.function_name() ) );
    }

-    virtual boost::exception_detail::clone_base const * clone() const
+    virtual boost::exception_detail::clone_base const * clone() const BOOST_OVERRIDE
    {
        wrapexcept * p = new wrapexcept( *this );
        deleter del = { p };
@ -151,7 +151,7 @@ public:
        return p;
    }

-    virtual void rethrow() const
+    virtual void rethrow() const BOOST_OVERRIDE
    {
        throw *this;
    }
Author	SHA1	Message	Date
Peter Dimov	da6f5420fe	Remove manual boost_install call from CMakeLists.txt	2020-06-14 19:19:43 +03:00
Peter Dimov	924eb33335	Merge pull request #16 from eldiener/develop Changes for Embarcadero C++ clang-based compilers, targeting Boost 1.74	2020-05-06 16:35:30 +03:00
Peter Dimov	37f7c5fd30	Add BOOST_OVERRIDE to clone() and rethrow()	2020-04-14 00:41:54 +03:00
Edward Diener	a9ea585926	Merge branch 'develop' of https://github.com/eldiener/throw_exception into cppbuilder	2020-04-08 12:53:23 -04:00
Edward Diener	237c7a35d6	Change __BORLANDC__ to BOOST_BORLANDC, which is defined in Boost config for the Embarcadero non-clang-based compilers.	2020-03-23 14:35:01 -04:00