songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6935 from lrineau/CGAL-fix_autotest_with_ctest-GF 

Fix autotest_cgal_with_ctest
This commit is contained in:
Laurent Rineau 2022-11-25 10:14:18 +01:00
parent 4ef4f036af 6fd4c16942
commit b363b7e4af
21 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_curve_kernel_2.h
View File

@ -356,10 +356,10 @@ public:
const OuterFunctor& outer)
: _inner(inner), _outer(outer) {}
Unary_compose(const Unary_compose& other)
: _inner(other._inner), _outer(other._outer) {}
Unary_compose(const Unary_compose& other) = default;
Unary_compose& operator=(const Unary_compose& other) = default;
Unary_compose() : _inner(::boost::none),_outer(::boost::none) {}
Unary_compose() : _inner(::boost::none),_outer(::boost::none) {}
typedef typename InnerFunctor::argument_type argument_type;
typedef typename OuterFunctor::result_type result_type;

4
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes.h
View File

@ -1147,8 +1147,8 @@ public:
Bitstream_descartes() : Base(new Rep()) {}
//! Copy constructor
Bitstream_descartes(const Self& other) : Base(static_cast<const Base&>(other))
{}
Bitstream_descartes(const Self& other) = default;
Bitstream_descartes& operator=(const Self& other) = default;
/*!
* \brief Constructor for a polynomial \c f

5
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes_E08_tree.h
View File

@ -436,6 +436,9 @@ public:
friend class CGAL::internal::Bitstream_descartes_E08_tree<TRAITS>;
friend class CGAL::internal::Bitstream_descartes_E08_tree_rep<TRAITS>;
Bitstream_descartes_E08_node(const Self&) = default;
Self& operator= (const Self&) = delete;
private:
// "node data" (set individually in subdivision)
Integer lower_num_, upper_num_; // TODO use lower_num_, width_num_ instead
@ -466,8 +469,6 @@ private:
log_eps_ = n.log_eps_;
log_C_eps_ = n.log_C_eps_;
}
Self& operator= (const Self&) = delete;
}; // struct Bitstream_descartes_E08_node

5
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes_rndl_tree.h
View File

@ -525,6 +525,9 @@ public:
friend class internal::Bitstream_descartes_rndl_tree<TRAITS>;
friend class internal::Bitstream_descartes_rndl_tree_rep<TRAITS>;
Bitstream_descartes_rndl_node(const Self&) = default;
Self& operator= (const Self&) = delete;
private:
// "node data" (set individually in subdivision)
Integer lower_num_, upper_num_; // TODO use lower_num_, width_num_ instead
@ -557,8 +560,6 @@ private:
log_eps_ = n.log_eps_;
log_C_eps_ = n.log_C_eps_;
}
Self& operator= (const Self&)=delete;
}; // struct Bitstream_descartes_rndl_node

10
Installation/CMakeLists.txt
View File

@ -354,7 +354,7 @@ include(${CGAL_MODULES_DIR}/CGAL_Macros.cmake)
include(${CGAL_MODULES_DIR}/CGAL_enable_end_of_configuration_hook.cmake)
cgal_setup_module_path()
if(RUNNING_CGAL_AUTO_TEST)
if(RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE)
message(STATUS "Operating system:")
execute_process(
COMMAND uname -a
@ -392,7 +392,7 @@ if(MSVC)
uniquely_add_flags(CGAL_CXX_FLAGS "/fp:except-")
uniquely_add_flags(CGAL_CXX_FLAGS "/bigobj") # Use /bigobj by default
if(RUNNING_CGAL_AUTO_TEST)
if(RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE)
set(CMAKE_CXX_WARNING_LEVEL
2
CACHE STRING "MSVC C++ compiler warning level" FORCE)
@ -445,7 +445,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
if(GCC_FOUND)
if(RUNNING_CGAL_AUTO_TEST)
if(RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE)
uniquely_add_flags(CGAL_CXX_FLAGS "-Wall")
# Remove -g from the relevant CMAKE_CXX_FLAGS. This will also
# propagate to the rest of the tests, since we overwrite those
@ -482,7 +482,7 @@ message("== Generate version files (DONE) ==\n")
#
#--------------------------------------------------------------------------------------------------
if(CGAL_DEV_MODE OR RUNNING_CGAL_AUTO_TEST)
if(CGAL_DEV_MODE OR RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE)
message("== Set up flags ==")
# Ugly hack to be compatible with current CGAL testsuite process (as of
@ -1256,4 +1256,4 @@ if(RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE)
if(Qt5_FOUND)
message(STATUS "USING Qt5_VERSION = '${Qt5Core_VERSION_STRING}'")
endif()#Qt5_FOUND
endif()#RUNNING_CGAL_AUTO_TEST
endif()#RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE

2
Installation/cmake/modules/CGAL_Common.cmake
View File

@ -4,7 +4,7 @@ option(CGAL_DEV_MODE
"Activate the CGAL developers mode. See https://github.com/CGAL/cgal/wiki/CGAL_DEV_MODE"
$ENV{CGAL_DEV_MODE})
if(RUNNING_CGAL_AUTO_TEST)
if(RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE)
# Just to avoid a warning from CMake if that variable is set on the command line...
endif()

2
Installation/cmake/modules/CGAL_SetupCGALDependencies.cmake
View File

@ -147,7 +147,7 @@ function(CGAL_setup_CGAL_dependencies target)
"-features=extensions;-library=stlport4;-D_GNU_SOURCE")
target_link_libraries(${target} INTERFACE "-library=stlport4")
elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
if ( RUNNING_CGAL_AUTO_TEST )
if ( RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE )
target_compile_options(${target} INTERFACE "-Wall")
endif()
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3)

2
Installation/cmake/modules/CGAL_SetupFlags.cmake
View File

@ -46,7 +46,7 @@ uniquely_add_flags( CMAKE_EXE_LINKER_FLAGS_DEBUG ${CGAL_EXE_LINKER_FLAGS_DE
# Set a default build type if none is given
if ( NOT CMAKE_BUILD_TYPE )
if( RUNNING_CGAL_AUTO_TEST )
if( RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE )
typed_cache_set ( STRING "Build type: Release, Debug, RelWithDebInfo or MinSizeRel" CMAKE_BUILD_TYPE Debug )
else ()
typed_cache_set ( STRING "Build type: Release, Debug, RelWithDebInfo or MinSizeRel" CMAKE_BUILD_TYPE Release )

2
Installation/cmake/modules/CGAL_enable_end_of_configuration_hook.cmake
View File

@ -90,7 +90,7 @@ function(CGAL_run_at_the_end_of_configuration variable access value current_list
if(DEFINED CMAKE_BUILD_TYPE AND ( NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "Debug") )
set(keyword WARNING)
set(type warning)
if(RUNNING_CGAL_AUTO_TEST)
if(RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE)
# No warning in the CMake test suite, but a status message
set(keyword)
set(type notice)

2
Installation/cmake/modules/UseCGAL.cmake
View File

@ -13,7 +13,7 @@ if(NOT USE_CGAL_FILE_INCLUDED)
set(USE_CGAL_FILE_INCLUDED 1)
include(${CMAKE_CURRENT_LIST_DIR}/CGAL_Common.cmake)
if( CGAL_DEV_MODE OR RUNNING_CGAL_AUTO_TEST )
if( CGAL_DEV_MODE OR RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE )
include(${CMAKE_CURRENT_LIST_DIR}/CGAL_SetupFlags.cmake)
else()
include(${CMAKE_CURRENT_LIST_DIR}/CGAL_display_flags.cmake)

4
Installation/lib/cmake/CGAL/CGALConfig.cmake
View File

@ -89,7 +89,7 @@ if (NOT CGAL_DATA_DIR)
if (EXISTS "${CMAKE_SOURCE_DIR}/../../data")
set(CGAL_DATA_DIR "${CMAKE_SOURCE_DIR}/../../data")
else()
if(CGAL_TEST_SUITE)
if(RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE)
message(WARNING "CGAL_DATA_DIR cannot be deduced, set the variable CGAL_DATA_DIR to set the default value of CGAL::data_file_path()")
endif()
endif()
@ -195,7 +195,7 @@ cgal_setup_module_path()
set(CGAL_USE_FILE ${CGAL_MODULES_DIR}/UseCGAL.cmake)
include(${CGAL_MODULES_DIR}/CGAL_target_use_TBB.cmake)
if( CGAL_DEV_MODE OR RUNNING_CGAL_AUTO_TEST )
if( CGAL_DEV_MODE OR RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE )
# Do not use -isystem for CGAL include paths
set(CMAKE_NO_SYSTEM_FROM_IMPORTED TRUE)
endif()

6
Minkowski_sum_2/include/CGAL/Minkowski_sum_2/AABB_segment_2_primitive.h
View File

@ -35,10 +35,8 @@ public:
{
}
AABB_segment_2_primitive(const AABB_segment_2_primitive &primitive)
{
m_it = primitive.id();
}
AABB_segment_2_primitive(const AABB_segment_2_primitive& primitive) = default;
AABB_segment_2_primitive& operator=(const AABB_segment_2_primitive& primitive) = default;
const Id &id() const
{

6
Nef_3/include/CGAL/Nef_3/SNC_SM_explorer.h
View File

@ -30,10 +30,8 @@ class SNC_SM_explorer : public SMCDEC {
public:
SNC_SM_explorer(const Base& E) : Base(E) {}
Self& operator=(const Self& E) {
Base::operator=(E);
return *this;
}
SNC_SM_explorer(const Self& E) = default;
Self& operator=(const Self& E) = default;
};
} //namespace CGAL

2
Number_types/include/CGAL/FPU.h
View File

@ -500,6 +500,7 @@ void
FPU_set_cw (FPU_CW_t cw)
{
#ifdef CGAL_ALWAYS_ROUND_TO_NEAREST
CGAL_USE(cw);
CGAL_assertion(cw == CGAL_FE_TONEAREST);
#else
CGAL_IA_SETFPCW(cw);
@ -511,6 +512,7 @@ FPU_CW_t
FPU_get_and_set_cw (FPU_CW_t cw)
{
#ifdef CGAL_ALWAYS_ROUND_TO_NEAREST
CGAL_USE(cw);
CGAL_assertion(cw == CGAL_FE_TONEAREST);
return CGAL_FE_TONEAREST;
#else

5
Partition_2/include/CGAL/Partition_2/Rotation_tree_2.h
View File

@ -47,7 +47,8 @@ public:
typedef typename Traits::Point_2 Point_2;
using internal::vector< Rotation_tree_node_2<Traits_> >::push_back;
using internal::vector< Rotation_tree_node_2<Traits_> >::back;
using internal::vector< Rotation_tree_node_2<Traits_> >::back;
using internal::vector< Rotation_tree_node_2<Traits_> >::erase;
class Greater {
typename Traits::Less_xy_2 less;
@ -78,7 +79,7 @@ public:
Greater greater (traits.less_xy_2_object());
Equal equal;
std::sort(this->begin(), this->end(), greater);
std::unique(this->begin(), this->end(),equal);
this->erase(std::unique(this->begin(), this->end(),equal), this->end());
// front() is the point with the largest x coordinate

2
Polyhedron/demo/Polyhedron/Plugins/Three_examples/CMakeLists.txt
View File

@ -17,7 +17,7 @@ find_package(
COMPONENTS OpenGL Script Svg
OPTIONAL_COMPONENTS ScriptTools WebSockets)
if(RUNNING_CGAL_AUTO_TEST)
if(RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE)
if(Qt5_FOUND)
include(${CGAL_USE_FILE})
endif()

2
STL_Extension/include/CGAL/Handle.h
View File

@ -122,7 +122,7 @@ class Handle
int
refs() const noexcept { return PTR->count.load(std::memory_order_relaxed); }
Id_type id() const noexcept { return PTR - static_cast<Rep*>(0); }
Id_type id() const noexcept { return std::distance(static_cast<Rep*>(0), PTR); }
bool identical(const Handle& h) const noexcept { return PTR == h.PTR; }

4
STL_Extension/include/CGAL/iterator.h
View File

@ -1283,6 +1283,8 @@ template < typename D, typename V = std::tuple<>, typename O = std::tuple<> >
struct Derivator
{
typedef Derivator<D, V, O> Self;
Derivator() = default;
Derivator(const Self&) = default;
Self& operator=(const Self&) = delete;
template <class Tuple>
void tuple_dispatch(const Tuple&)
@ -1296,6 +1298,8 @@ struct Derivator<D, std::tuple<V1, V...>, std::tuple<O1, O...> >
typedef Derivator<D, std::tuple<V1, V...>, std::tuple<O1, O...> > Self;
typedef Derivator<D, std::tuple<V...>, std::tuple<O...> > Base;
Derivator() = default;
Derivator(const Self&) = default;
Self& operator=(const Self&) = delete;
using Base::operator=;

2
Set_movable_separability_2/test/Set_movable_separability_2/CMakeLists.txt
View File

@ -4,7 +4,7 @@
cmake_minimum_required(VERSION 3.1...3.23)
project(Set_movable_separability_2_Tests)
if(RUNNING_CGAL_AUTO_TEST)
if(RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE)
# Just to avoid a warning from CMake when that variable is set on the command line...
endif()
if(CGAL_DIR)

2
Surface_mesher/examples/Surface_mesher/CMakeLists.txt
View File

@ -11,7 +11,7 @@ if(CGAL_ImageIO_FOUND)
create_single_source_cgal_program("mesh_an_implicit_function.cpp")
else()
if(RUNNING_CGAL_AUTO_TEST)
if(RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE)
# Just to avoid a warning from CMake if that variable is set on the command line...
endif()

2
Three/doc/Three/Three.txt
View File

@ -392,7 +392,7 @@ Notice that an external plugin will not be automatically loaded in the Polyhedro
\section example Examples
All the examples are de-activated in the cmake list outside of our testsuite. To tesr them, one must add `-DRUNNING_CGAL_AUTO_TEST=ON` to the cmake call.
All the examples are de-activated in the cmake list outside of our testsuite. To test them, one must add `-DCGAL_TEST_SUITE=ON` to the cmake call.
\subsection example1 Creating a Basic Plugin
\cgalExample{Three_examples/Basic_plugin.cpp}