From 967220c58517e67df2b6b2a974d6d79253d28879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 22 Apr 2020 15:05:56 +0200 Subject: [PATCH] Simplified cmake files --- .../Decimating/DecimaterGui/CMakeLists.txt | 16 ++++++---------- src/OpenMesh/Apps/Dualizer/CMakeLists.txt | 7 +------ src/OpenMesh/Apps/ProgViewer/CMakeLists.txt | 19 +++++++++++-------- .../Apps/ProgViewer/ProgViewerWidget.hh | 2 +- .../Subdivider/SubdividerGui/CMakeLists.txt | 19 ++++++------------- .../CMakeLists.txt | 7 +------ .../commandlineSubdivider/CMakeLists.txt | 7 +------ .../Apps/VDProgMesh/Analyzer/CMakeLists.txt | 7 +------ .../VDProgMesh/mkbalancedpm/CMakeLists.txt | 7 +------ src/OpenMesh/Apps/mconvert/CMakeLists.txt | 1 - 10 files changed, 29 insertions(+), 63 deletions(-) diff --git a/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt b/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt index 4c5860a5..9e86fba5 100644 --- a/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt +++ b/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt @@ -5,18 +5,14 @@ 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") -list (APPEND headers "../../QtViewer/MeshViewerWidget.hh") - - set (sources ../../QtViewer/QGLViewerWidget.cc ../../QtViewer/MeshViewerWidget.cc diff --git a/src/OpenMesh/Apps/Dualizer/CMakeLists.txt b/src/OpenMesh/Apps/Dualizer/CMakeLists.txt index 65a36fc2..59b60ea7 100644 --- a/src/OpenMesh/Apps/Dualizer/CMakeLists.txt +++ b/src/OpenMesh/Apps/Dualizer/CMakeLists.txt @@ -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 diff --git a/src/OpenMesh/Apps/ProgViewer/CMakeLists.txt b/src/OpenMesh/Apps/ProgViewer/CMakeLists.txt index f963a5e9..b2f5eb90 100644 --- a/src/OpenMesh/Apps/ProgViewer/CMakeLists.txt +++ b/src/OpenMesh/Apps/ProgViewer/CMakeLists.txt @@ -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}) diff --git a/src/OpenMesh/Apps/ProgViewer/ProgViewerWidget.hh b/src/OpenMesh/Apps/ProgViewer/ProgViewerWidget.hh index 0ca3f9ae..c62201af 100644 --- a/src/OpenMesh/Apps/ProgViewer/ProgViewerWidget.hh +++ b/src/OpenMesh/Apps/ProgViewer/ProgViewerWidget.hh @@ -75,7 +75,7 @@ struct ProgTraits : public OpenMesh::DefaultTraits typedef OpenMesh::TriMesh_ArrayKernelT MyMesh; -typedef MeshViewerWidgetT MeshViewerWidgetProgBase; +typedef MeshViewerWidgetT MeshViewerWidgetProgBase; //== CLASS DEFINITION ========================================================= diff --git a/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt b/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt index 34acac1e..85bec8d4 100644 --- a/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt +++ b/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt @@ -5,23 +5,16 @@ 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") -list (APPEND headers "../../QtViewer/MeshViewerWidget.hh") -list (APPEND headers "../../QtViewer/QGLViewerWidget.hh") - - set (sources ../../QtViewer/QGLViewerWidget.cc - ../../QtViewer/MeshViewerWidget.cc ../SubdivideWidget.cc ../qtsubdivider.cc ) diff --git a/src/OpenMesh/Apps/Subdivider/commandlineAdaptiveSubdivider/CMakeLists.txt b/src/OpenMesh/Apps/Subdivider/commandlineAdaptiveSubdivider/CMakeLists.txt index 35800704..fab21891 100644 --- a/src/OpenMesh/Apps/Subdivider/commandlineAdaptiveSubdivider/CMakeLists.txt +++ b/src/OpenMesh/Apps/Subdivider/commandlineAdaptiveSubdivider/CMakeLists.txt @@ -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 diff --git a/src/OpenMesh/Apps/Subdivider/commandlineSubdivider/CMakeLists.txt b/src/OpenMesh/Apps/Subdivider/commandlineSubdivider/CMakeLists.txt index 0ef2b3bb..7382747e 100644 --- a/src/OpenMesh/Apps/Subdivider/commandlineSubdivider/CMakeLists.txt +++ b/src/OpenMesh/Apps/Subdivider/commandlineSubdivider/CMakeLists.txt @@ -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 diff --git a/src/OpenMesh/Apps/VDProgMesh/Analyzer/CMakeLists.txt b/src/OpenMesh/Apps/VDProgMesh/Analyzer/CMakeLists.txt index f1e00640..e79f19ab 100644 --- a/src/OpenMesh/Apps/VDProgMesh/Analyzer/CMakeLists.txt +++ b/src/OpenMesh/Apps/VDProgMesh/Analyzer/CMakeLists.txt @@ -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 diff --git a/src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/CMakeLists.txt b/src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/CMakeLists.txt index f4662079..edb4ff54 100644 --- a/src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/CMakeLists.txt +++ b/src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/CMakeLists.txt @@ -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 diff --git a/src/OpenMesh/Apps/mconvert/CMakeLists.txt b/src/OpenMesh/Apps/mconvert/CMakeLists.txt index 28e33b5c..0ab863b1 100644 --- a/src/OpenMesh/Apps/mconvert/CMakeLists.txt +++ b/src/OpenMesh/Apps/mconvert/CMakeLists.txt @@ -2,7 +2,6 @@ include (ACGCommon) include_directories ( ../../.. - ${CMAKE_CURRENT_SOURCE_DIR} ) acg_add_executable (mconvert mconvert.cc)