Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'CMAKE_3.17_fix' into 'master'

Browse Source 
Cmake 3.17 fix

See merge request OpenMesh/OpenMesh!258
This commit is contained in:
Jan Möbius
2020-04-22 17:07:59 +02:00
parent c1e5815efe 29f57cbe00
commit 9074272042
23 changed files with 77 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CI/ci-mac-build.sh
View File

@@ -13,6 +13,8 @@ echo "BuildPath: $BUILDPATH"
echo "Path: $PATH"
echo "Language: $LANGUAGE"
cmake --version
echo -e "${OUTPUT}"
echo ""
echo "======================================================================"
@@ -58,4 +60,4 @@ if [ "$BUILD_TYPE_L" == "release" ]; then
cd ..
fi
fi

5
cmake/ACGQt.cmake
View File

@@ -101,5 +101,10 @@ macro (acg_qt5)
# Enable automoc
set(CMAKE_AUTOMOC ON)
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.17")
cmake_policy(SET CMP0100 NEW)
endif()
endif (QT5_FOUND)
endmacro ()

16
src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt
View File

@@ -5,19 +5,17 @@ include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
# source code directories
set (directories
../../QtViewer
../
set (headers
../DecimaterViewerWidget.hh
../../QtViewer/QGLViewerWidget.hh
../../QtViewer/MeshViewerWidgetT.hh
../../QtViewer/MeshViewerWidget.hh
../../QtViewer/MeshViewerWidgetT_impl.hh
)
# collect all header and source files
acg_append_files (headers "*.hh" ${directories})
list (APPEND headers "../../QtViewer/MeshViewerWidgetT_impl.hh")
set (sources
../../QtViewer/QGLViewerWidget.cc
../../QtViewer/MeshViewerWidget.cc
../DecimaterViewerWidget.cc
../decimaterviewer.cc
)

8
src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh
View File

@@ -91,18 +91,18 @@ struct MyTraits : public DEFAULT_TRAITS
};
typedef TRIMESH_KERNEL<MyTraits> mesh_t;
typedef MeshViewerWidgetT<mesh_t> MeshViewerWidget;
typedef MeshViewerWidgetT<mesh_t> MeshViewerWidgetDecimaterBase;
//== CLASS DEFINITION =========================================================
class DecimaterViewerWidget : public MeshViewerWidget
class DecimaterViewerWidget : public MeshViewerWidgetDecimaterBase
{
Q_OBJECT
public:
typedef MeshViewerWidget inherited_t;
typedef MeshViewerWidgetDecimaterBase inherited_t;
typedef Decimater::DecimaterT<mesh_t> decimater_t;
typedef Decimater::ModQuadricT< mesh_t >::Handle mod_quadric_t;
@@ -119,7 +119,7 @@ public:
/// default constructor
explicit DecimaterViewerWidget(QWidget* _parent=0)
: MeshViewerWidget(_parent),
: MeshViewerWidgetDecimaterBase(_parent),
animate_(false),
timer_(0),
steps_(1)

7
src/OpenMesh/Apps/Decimating/commandlineDecimater/CMakeLists.txt
View File

@@ -5,12 +5,7 @@ include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
# collect all header and source files
set (sources
../decimater.cc
)
acg_add_executable (commandlineDecimater ${sources})
acg_add_executable (commandlineDecimater ../decimater.cc)
target_link_libraries (commandlineDecimater
OpenMeshCore

7
src/OpenMesh/Apps/Dualizer/CMakeLists.txt
View File

@@ -2,14 +2,9 @@ include (ACGCommon)
include_directories (
../../..
${CMAKE_CURRENT_SOURCE_DIR}
)
# collect all header and source files
acg_append_files (headers "*.hh" .)
acg_append_files (sources "*.cc" .)
acg_add_executable (Dualizer ${headers} ${sources})
acg_add_executable (Dualizer dualizer.cc)
target_link_libraries (Dualizer
OpenMeshCore

19
src/OpenMesh/Apps/ProgViewer/CMakeLists.txt
View File

@@ -6,15 +6,18 @@ include_directories (
)
# collect all header and source files
acg_append_files (headers "*.hh" .)
acg_append_files (sources "*.cc" .)
set( headers
ProgViewerWidget.hh
../QtViewer/QGLViewerWidget.hh
../QtViewer/MeshViewerWidgetT.hh
../QtViewer/MeshViewerWidgetT_impl.hh
)
list (APPEND sources "../QtViewer/QGLViewerWidget.cc")
list (APPEND headers "../QtViewer/QGLViewerWidget.hh")
list (APPEND headers "../QtViewer/MeshViewerWidgetT.hh")
list (APPEND headers "../QtViewer/MeshViewerWidgetT_impl.hh")
set( sources
ProgViewerWidget.cc
progviewer.cc
../QtViewer/QGLViewerWidget.cc
)
if (WIN32)
acg_add_executable( ProgViewer WIN32 ${sources} ${headers})

12
src/OpenMesh/Apps/ProgViewer/ProgViewerWidget.hh
View File

@@ -63,7 +63,7 @@ using namespace OpenMesh;
using namespace OpenMesh::Attributes;
struct MyTraits : public OpenMesh::DefaultTraits
struct ProgTraits : public OpenMesh::DefaultTraits
{
VertexAttributes ( OpenMesh::Attributes::Normal |
OpenMesh::Attributes::Status );
@@ -74,28 +74,28 @@ struct MyTraits : public OpenMesh::DefaultTraits
};
typedef OpenMesh::TriMesh_ArrayKernelT<MyTraits> MyMesh;
typedef MeshViewerWidgetT<MyMesh> MeshViewerWidget;
typedef OpenMesh::TriMesh_ArrayKernelT<ProgTraits> MyMesh;
typedef MeshViewerWidgetT<MyMesh> MeshViewerWidgetProgBase;
//== CLASS DEFINITION =========================================================
class ProgViewerWidget : public MeshViewerWidget
class ProgViewerWidget : public MeshViewerWidgetProgBase
{
Q_OBJECT
public:
typedef MeshViewerWidget Base;
typedef MeshViewerWidgetProgBase Base;
typedef ProgViewerWidget This;
public:
/// default constructor
explicit ProgViewerWidget(QWidget* _parent=0)
: MeshViewerWidget(_parent),
: MeshViewerWidgetProgBase(_parent),
n_base_vertices_(0),
n_base_faces_(0),
n_detail_vertices_(0),

13
src/OpenMesh/Apps/QtViewer/CMakeLists.txt
View File

@@ -10,9 +10,16 @@ set (directories
.
)
# collect all header and source files
acg_append_files (headers "*.hh" ${directories})
acg_append_files (sources "*.cc" ${directories})
set (sources
MeshViewerWidget.cc
QGLViewerWidget.cc
meshviewer.cc
)
set (headers
MeshViewerWidget.hh
QGLViewerWidget.hh
)
if (WIN32)
acg_add_executable (QtViewer WIN32 ${sources} ${headers})

4
src/OpenMesh/Apps/QtViewer/MeshViewerWidget.hh
View File

@@ -61,12 +61,12 @@
using namespace OpenMesh;
using namespace OpenMesh::Attributes;
struct MyTraits : public OpenMesh::DefaultTraits
struct MeshViewerWidgetTraits : public OpenMesh::DefaultTraits
{
HalfedgeAttributes(OpenMesh::Attributes::PrevHalfedge);
};
typedef OpenMesh::TriMesh_ArrayKernelT<MyTraits> MyMesh;
typedef OpenMesh::TriMesh_ArrayKernelT<MeshViewerWidgetTraits> MyMesh;

2
src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT.hh
View File

@@ -191,7 +191,7 @@ protected:
//=============================================================================
#if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESHAPPS_MESHVIEWERWIDGET_CC)
#if defined(OM_INCLUDE_TEMPLATES)
# define OPENMESH_MESHVIEWERWIDGET_TEMPLATES
# include "MeshViewerWidgetT_impl.hh"
#endif

5
src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT_impl.hh
View File

@@ -39,9 +39,7 @@
* *
* ========================================================================= */
#define OPENMESHAPPS_MESHVIEWERWIDGET_CC
#pragma once
//== INCLUDES =================================================================
@@ -69,7 +67,6 @@ using namespace Qt;
# undef max
#endif
using namespace Qt;
//== IMPLEMENTATION ==========================================================

6
src/OpenMesh/Apps/Smoothing/CMakeLists.txt
View File

@@ -5,11 +5,7 @@ include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
# collect all header and source files
acg_append_files (headers "*.hh" .)
acg_append_files (sources "*.cc" .)
acg_add_executable (Smoothing ${headers} ${sources})
acg_add_executable (Smoothing smooth.cc)
target_link_libraries (Smoothing
OpenMeshCore

6
src/OpenMesh/Apps/Subdivider/MeshViewerWidget.hh
View File

@@ -66,18 +66,18 @@ typedef OpenMesh::TriMesh_ArrayKernelT<Traits> Mesh;
class MeshViewerWidget : public MeshViewerWidgetT<Mesh>
class MeshViewerWidgetSubdivider : public MeshViewerWidgetT<Mesh>
{
public:
typedef MeshViewerWidgetT<Mesh> Base;
/// default constructor
explicit MeshViewerWidget(QWidget* _parent=0)
explicit MeshViewerWidgetSubdivider(QWidget* _parent=0)
: Base(_parent)
{}
/// destructor
~MeshViewerWidget() {}
~MeshViewerWidgetSubdivider() {}
/// open mesh
inline bool open_mesh(const char* _filename, OpenMesh::IO::Options _opt) override

2
src/OpenMesh/Apps/Subdivider/SubdivideWidget.cc
View File

@@ -98,7 +98,7 @@ SubdivideWidget(QWidget* _parent, const char* _name)
// sel_topo_type will be set when adding the radio button.;
// examiner widget
viewer_widget_ = new MeshViewerWidget();
viewer_widget_ = new MeshViewerWidgetSubdivider();
vbox->addWidget(viewer_widget_);

2
src/OpenMesh/Apps/Subdivider/SubdivideWidget.hh
View File

@@ -116,7 +116,7 @@ private slots:
private:
// widgets
MeshViewerWidget* viewer_widget_;
MeshViewerWidgetSubdivider* viewer_widget_;
QTimer *timer_;

16
src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt
View File

@@ -5,18 +5,14 @@ include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
# source code directories
set (directories
../../QtViewer
../
set (headers
../MeshViewerWidget.hh
../SubdivideWidget.hh
../../QtViewer/QGLViewerWidget.hh
../../QtViewer/MeshViewerWidgetT.hh
../../QtViewer/MeshViewerWidgetT_impl.hh
)
# collect all header and source files
acg_append_files (headers "*.hh" ${directories})
list (APPEND headers "../../QtViewer/MeshViewerWidgetT_impl.hh")
set (sources
../../QtViewer/QGLViewerWidget.cc
../SubdivideWidget.cc

7
src/OpenMesh/Apps/Subdivider/commandlineAdaptiveSubdivider/CMakeLists.txt
View File

@@ -5,12 +5,7 @@ include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
# collect all header and source files
set (sources
../adaptive_subdivider.cc
)
acg_add_executable (commandlineAdaptiveSubdivider ${sources})
acg_add_executable (commandlineAdaptiveSubdivider ../adaptive_subdivider.cc)
target_link_libraries (commandlineAdaptiveSubdivider
OpenMeshCore

7
src/OpenMesh/Apps/Subdivider/commandlineSubdivider/CMakeLists.txt
View File

@@ -5,12 +5,7 @@ include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
# collect all header and source files
set (sources
../subdivider.cc
)
acg_add_executable (commandlineSubdivider ${sources})
acg_add_executable (commandlineSubdivider ../subdivider.cc)
target_link_libraries (commandlineSubdivider
OpenMeshCore

7
src/OpenMesh/Apps/VDProgMesh/Analyzer/CMakeLists.txt
View File

@@ -5,12 +5,7 @@ include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
# collect all header and source files
set (sources
./vdpmanalyzer.cc
)
acg_add_executable (Analyzer ${sources})
acg_add_executable (Analyzer vdpmanalyzer.cc)
target_link_libraries (Analyzer
OpenMeshCore

15
src/OpenMesh/Apps/VDProgMesh/Synthesizer/CMakeLists.txt
View File

@@ -5,15 +5,16 @@ include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
# collect all header and source files
acg_append_files (headers "*.hh" .)
acg_append_files (sources "*.cc" .)
set (headers
VDPMSynthesizerViewerWidget.hh
)
list (APPEND sources "../../QtViewer/QGLViewerWidget.cc")
set (sources
../../QtViewer/QGLViewerWidget.cc
vdpmsynthesizer.cc
VDPMSynthesizerViewerWidget.cc
)
list (APPEND headers "../../QtViewer/QGLViewerWidget.hh")
list (APPEND headers "../../QtViewer/MeshViewerWidgetT.hh")
list (APPEND headers "../../QtViewer/MeshViewerWidgetT_impl.hh")
if (WIN32)
acg_add_executable (Synthesizer WIN32 ${sources} ${headers})

7
src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/CMakeLists.txt
View File

@@ -5,12 +5,7 @@ include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
# collect all header and source files
set (sources
./mkbalancedpm.cc
)
acg_add_executable (mkbalancedpm ${sources})
acg_add_executable (mkbalancedpm mkbalancedpm.cc)
target_link_libraries (mkbalancedpm
OpenMeshCore

7
src/OpenMesh/Apps/mconvert/CMakeLists.txt
View File

@@ -2,14 +2,9 @@ include (ACGCommon)
include_directories (
../../..
${CMAKE_CURRENT_SOURCE_DIR}
)
# collect all header and source files
acg_append_files (headers "*.hh" .)
acg_append_files (sources "*.cc" .)
acg_add_executable (mconvert ${headers} ${sources})
acg_add_executable (mconvert mconvert.cc)
target_link_libraries (mconvert
OpenMeshCore