diff --git a/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt b/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt index cdf8c291..5357f844 100644 --- a/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt +++ b/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt @@ -7,9 +7,6 @@ include_directories ( ${QT_INCLUDE_DIR} ) - -set (targetName DecimaterGui) - # source code directories set (directories ../../QtViewer @@ -30,14 +27,14 @@ set (sources acg_drop_templates (sources) if (WIN32) - acg_add_executable (${targetName} WIN32 ${sources} ${headers}) + acg_add_executable (DecimaterGui WIN32 ${sources} ${headers}) # link to qtmain library to get WinMain function for a non terminal app - target_link_libraries (${targetName} ${QT_QTMAIN_LIBRARY}) + target_link_libraries (DecimaterGui ${QT_QTMAIN_LIBRARY}) else () - acg_add_executable (${targetName} ${sources} ${headers} ) + acg_add_executable (DecimaterGui ${sources} ${headers} ) endif () -target_link_libraries (${targetName} +target_link_libraries (DecimaterGui OpenMeshCore OpenMeshTools ${QT_LIBRARIES} diff --git a/src/OpenMesh/Apps/Decimating/commandlineDecimater/CMakeLists.txt b/src/OpenMesh/Apps/Decimating/commandlineDecimater/CMakeLists.txt index 67642927..daa3ec11 100644 --- a/src/OpenMesh/Apps/Decimating/commandlineDecimater/CMakeLists.txt +++ b/src/OpenMesh/Apps/Decimating/commandlineDecimater/CMakeLists.txt @@ -5,16 +5,14 @@ include_directories ( ${CMAKE_CURRENT_SOURCE_DIR} ) -set (targetName commandlineDecimater) - # collect all header and source files set (sources ../decimater.cc ) -acg_add_executable (${targetName} ${sources}) +acg_add_executable (commandlineDecimater ${sources}) -target_link_libraries (${targetName} +target_link_libraries (commandlineDecimater OpenMeshCore OpenMeshTools ) diff --git a/src/OpenMesh/Apps/Dualizer/CMakeLists.txt b/src/OpenMesh/Apps/Dualizer/CMakeLists.txt index 861f5fed..65a36fc2 100644 --- a/src/OpenMesh/Apps/Dualizer/CMakeLists.txt +++ b/src/OpenMesh/Apps/Dualizer/CMakeLists.txt @@ -5,15 +5,13 @@ include_directories ( ${CMAKE_CURRENT_SOURCE_DIR} ) -set (targetName Dualizer) - # collect all header and source files acg_append_files (headers "*.hh" .) acg_append_files (sources "*.cc" .) -acg_add_executable (${targetName} ${headers} ${sources}) +acg_add_executable (Dualizer ${headers} ${sources}) -target_link_libraries (${targetName} +target_link_libraries (Dualizer OpenMeshCore OpenMeshTools ) diff --git a/src/OpenMesh/Apps/ProgViewer/CMakeLists.txt b/src/OpenMesh/Apps/ProgViewer/CMakeLists.txt index 174fe47b..e25a2c6b 100644 --- a/src/OpenMesh/Apps/ProgViewer/CMakeLists.txt +++ b/src/OpenMesh/Apps/ProgViewer/CMakeLists.txt @@ -7,8 +7,6 @@ include_directories ( ${QT_INCLUDE_DIR} ) -set (targetName ProgViewer) - # collect all header and source files acg_append_files (headers "*.hh" .) @@ -20,34 +18,18 @@ list (APPEND sources "../QtViewer/MeshViewerWidgetT.cc") list (APPEND headers "../QtViewer/QGLViewerWidget.hh") list (APPEND headers "../QtViewer/MeshViewerWidgetT.hh") - -# # source code directories -# set (directories -# . -# ../QtViewer -# ) - -# # collect all header and source files -# acg_append_files (headers "*.hh" ${directories}) - -# set (sources -# ../../QtViewer/QGLViewerWidget.cc -# ../../QtViewer/MeshViewerWidgetT.cc -# ./ProgViewerWidget.cc -# ) - # remove template cc files from source file list acg_drop_templates (sources) if (WIN32) - acg_add_executable (${targetName} WIN32 ${sources} ${headers}) + acg_add_executable( ProgViewer WIN32 ${sources} ${headers}) # link to qtmain library to get WinMain function for a non terminal app - target_link_libraries (${targetName} ${QT_QTMAIN_LIBRARY}) + target_link_libraries( ProgViewer ${QT_QTMAIN_LIBRARY}) else () - acg_add_executable (${targetName} ${sources} ${headers}) + acg_add_executable( ProgViewer ${sources} ${headers}) endif () -target_link_libraries (${targetName} +target_link_libraries ( ProgViewer OpenMeshCore OpenMeshTools ${QT_LIBRARIES} diff --git a/src/OpenMesh/Apps/Smoothing/CMakeLists.txt b/src/OpenMesh/Apps/Smoothing/CMakeLists.txt index 82eac480..e330787f 100644 --- a/src/OpenMesh/Apps/Smoothing/CMakeLists.txt +++ b/src/OpenMesh/Apps/Smoothing/CMakeLists.txt @@ -5,15 +5,13 @@ include_directories ( ${CMAKE_CURRENT_SOURCE_DIR} ) -set (targetName Smoothing) - # collect all header and source files acg_append_files (headers "*.hh" .) acg_append_files (sources "*.cc" .) -acg_add_executable (${targetName} ${headers} ${sources}) +acg_add_executable (Smoothing ${headers} ${sources}) -target_link_libraries (${targetName} +target_link_libraries (Smoothing OpenMeshCore OpenMeshTools ) diff --git a/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt b/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt index bc0b4b61..112eb226 100644 --- a/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt +++ b/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt @@ -7,8 +7,6 @@ include_directories ( ${QT_INCLUDE_DIR} ) -set (targetName SubdividerGui) - # source code directories set (directories ../../QtViewer @@ -29,14 +27,14 @@ set (sources acg_drop_templates (sources) if (WIN32) - acg_add_executable (${targetName} WIN32 ${sources} ${headers}) + acg_add_executable (SubdividerGui WIN32 ${sources} ${headers}) # link to qtmain library to get WinMain function for a non terminal app - target_link_libraries (${targetName} ${QT_QTMAIN_LIBRARY}) + target_link_libraries (SubdividerGui ${QT_QTMAIN_LIBRARY}) else () - acg_add_executable (${targetName} ${sources} ${headers}) + acg_add_executable (SubdividerGui ${sources} ${headers}) endif () -target_link_libraries (${targetName} +target_link_libraries (SubdividerGui OpenMeshCore OpenMeshTools ${QT_LIBRARIES} diff --git a/src/OpenMesh/Apps/Subdivider/commandlineAdaptiveSubdivider/CMakeLists.txt b/src/OpenMesh/Apps/Subdivider/commandlineAdaptiveSubdivider/CMakeLists.txt index 0cd93599..35800704 100644 --- a/src/OpenMesh/Apps/Subdivider/commandlineAdaptiveSubdivider/CMakeLists.txt +++ b/src/OpenMesh/Apps/Subdivider/commandlineAdaptiveSubdivider/CMakeLists.txt @@ -5,16 +5,14 @@ include_directories ( ${CMAKE_CURRENT_SOURCE_DIR} ) -set (targetName commandlineAdaptiveSubdivider) - # collect all header and source files set (sources ../adaptive_subdivider.cc ) -acg_add_executable (${targetName} ${sources}) +acg_add_executable (commandlineAdaptiveSubdivider ${sources}) -target_link_libraries (${targetName} +target_link_libraries (commandlineAdaptiveSubdivider OpenMeshCore OpenMeshTools ) diff --git a/src/OpenMesh/Apps/Subdivider/commandlineSubdivider/CMakeLists.txt b/src/OpenMesh/Apps/Subdivider/commandlineSubdivider/CMakeLists.txt index bcc48469..0ef2b3bb 100644 --- a/src/OpenMesh/Apps/Subdivider/commandlineSubdivider/CMakeLists.txt +++ b/src/OpenMesh/Apps/Subdivider/commandlineSubdivider/CMakeLists.txt @@ -5,16 +5,14 @@ include_directories ( ${CMAKE_CURRENT_SOURCE_DIR} ) -set (targetName commandlineSubdivider) - # collect all header and source files set (sources ../subdivider.cc ) -acg_add_executable (${targetName} ${sources}) +acg_add_executable (commandlineSubdivider ${sources}) -target_link_libraries (${targetName} +target_link_libraries (commandlineSubdivider OpenMeshCore OpenMeshTools ) diff --git a/src/OpenMesh/Apps/VDProgMesh/Analyzer/CMakeLists.txt b/src/OpenMesh/Apps/VDProgMesh/Analyzer/CMakeLists.txt index 16c92eb6..f1e00640 100644 --- a/src/OpenMesh/Apps/VDProgMesh/Analyzer/CMakeLists.txt +++ b/src/OpenMesh/Apps/VDProgMesh/Analyzer/CMakeLists.txt @@ -5,16 +5,14 @@ include_directories ( ${CMAKE_CURRENT_SOURCE_DIR} ) -set (targetName Analyzer) - # collect all header and source files set (sources ./vdpmanalyzer.cc ) -acg_add_executable (${targetName} ${sources}) +acg_add_executable (Analyzer ${sources}) -target_link_libraries (${targetName} +target_link_libraries (Analyzer OpenMeshCore OpenMeshTools ) diff --git a/src/OpenMesh/Apps/VDProgMesh/Synthesizer/CMakeLists.txt b/src/OpenMesh/Apps/VDProgMesh/Synthesizer/CMakeLists.txt index f676728b..2beaac53 100644 --- a/src/OpenMesh/Apps/VDProgMesh/Synthesizer/CMakeLists.txt +++ b/src/OpenMesh/Apps/VDProgMesh/Synthesizer/CMakeLists.txt @@ -7,8 +7,6 @@ include_directories ( ${QT_INCLUDE_DIR} ) -set (targetName Synthesizer) - # collect all header and source files acg_append_files (headers "*.hh" .) acg_append_files (sources "*.cc" .) @@ -23,14 +21,14 @@ list (APPEND headers "../../QtViewer/MeshViewerWidgetT.hh") acg_drop_templates (sources) if (WIN32) - acg_add_executable (${targetName} WIN32 ${sources} ${headers}) + acg_add_executable (Synthesizer WIN32 ${sources} ${headers}) # link to qtmain library to get WinMain function for a non terminal app - target_link_libraries (${targetName} ${QT_QTMAIN_LIBRARY}) + target_link_libraries (Synthesizer ${QT_QTMAIN_LIBRARY}) else () - acg_add_executable (${targetName} ${sources} ${headers}) + acg_add_executable (Synthesizer ${sources} ${headers}) endif () -target_link_libraries (${targetName} +target_link_libraries (Synthesizer OpenMeshCore OpenMeshTools ${QT_LIBRARIES} diff --git a/src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/CMakeLists.txt b/src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/CMakeLists.txt index c0e311e4..f4662079 100644 --- a/src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/CMakeLists.txt +++ b/src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/CMakeLists.txt @@ -5,16 +5,14 @@ include_directories ( ${CMAKE_CURRENT_SOURCE_DIR} ) -set (targetName mkbalancedpm) - # collect all header and source files set (sources ./mkbalancedpm.cc ) -acg_add_executable (${targetName} ${sources}) +acg_add_executable (mkbalancedpm ${sources}) -target_link_libraries (${targetName} +target_link_libraries (mkbalancedpm OpenMeshCore OpenMeshTools ) diff --git a/src/OpenMesh/Apps/mconvert/CMakeLists.txt b/src/OpenMesh/Apps/mconvert/CMakeLists.txt index dc76a122..b4c29800 100644 --- a/src/OpenMesh/Apps/mconvert/CMakeLists.txt +++ b/src/OpenMesh/Apps/mconvert/CMakeLists.txt @@ -5,15 +5,13 @@ include_directories ( ${CMAKE_CURRENT_SOURCE_DIR} ) -set (targetName mconvert) - # collect all header and source files acg_append_files (headers "*.hh" .) acg_append_files (sources "*.cc" .) -acg_add_executable (${targetName} ${headers} ${sources}) +acg_add_executable (mconvert ${headers} ${sources}) -target_link_libraries (${targetName} +target_link_libraries (mconvert OpenMeshCore OpenMeshTools )