From cf867c642c5a8438cfd39b2887b6baf3aadc8165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 22 Apr 2020 14:44:27 +0200 Subject: [PATCH] Fixed typo --- .../Decimating/commandlineDecimater/CMakeLists.txt | 7 +------ src/OpenMesh/Apps/QtViewer/CMakeLists.txt | 13 ++++++++++--- src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT.hh | 2 +- .../Apps/QtViewer/MeshViewerWidgetT_impl.hh | 5 +---- src/OpenMesh/Apps/Smoothing/CMakeLists.txt | 6 +----- src/OpenMesh/Apps/mconvert/CMakeLists.txt | 6 +----- 6 files changed, 15 insertions(+), 24 deletions(-) diff --git a/src/OpenMesh/Apps/Decimating/commandlineDecimater/CMakeLists.txt b/src/OpenMesh/Apps/Decimating/commandlineDecimater/CMakeLists.txt index daa3ec11..2fb5a47d 100644 --- a/src/OpenMesh/Apps/Decimating/commandlineDecimater/CMakeLists.txt +++ b/src/OpenMesh/Apps/Decimating/commandlineDecimater/CMakeLists.txt @@ -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 diff --git a/src/OpenMesh/Apps/QtViewer/CMakeLists.txt b/src/OpenMesh/Apps/QtViewer/CMakeLists.txt index 62a327b6..231fea48 100644 --- a/src/OpenMesh/Apps/QtViewer/CMakeLists.txt +++ b/src/OpenMesh/Apps/QtViewer/CMakeLists.txt @@ -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}) diff --git a/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT.hh b/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT.hh index fcf6762d..d7223cd7 100644 --- a/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT.hh +++ b/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT.hh @@ -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 diff --git a/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT_impl.hh b/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT_impl.hh index fb627d1f..e796f7ce 100644 --- a/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT_impl.hh +++ b/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT_impl.hh @@ -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 ========================================================== diff --git a/src/OpenMesh/Apps/Smoothing/CMakeLists.txt b/src/OpenMesh/Apps/Smoothing/CMakeLists.txt index e330787f..dc397424 100644 --- a/src/OpenMesh/Apps/Smoothing/CMakeLists.txt +++ b/src/OpenMesh/Apps/Smoothing/CMakeLists.txt @@ -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 diff --git a/src/OpenMesh/Apps/mconvert/CMakeLists.txt b/src/OpenMesh/Apps/mconvert/CMakeLists.txt index b4c29800..28e33b5c 100644 --- a/src/OpenMesh/Apps/mconvert/CMakeLists.txt +++ b/src/OpenMesh/Apps/mconvert/CMakeLists.txt @@ -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 (mconvert ${headers} ${sources}) +acg_add_executable (mconvert mconvert.cc) target_link_libraries (mconvert OpenMeshCore