Some cleanup in App cmake files to make them smaller and more readable

This commit is contained in:
Jan Möbius
2018-12-14 11:59:42 +01:00
parent 92b580a9ec
commit 06061b2d5b
12 changed files with 32 additions and 73 deletions

View File

@@ -7,9 +7,6 @@ include_directories (
${QT_INCLUDE_DIR} ${QT_INCLUDE_DIR}
) )
set (targetName DecimaterGui)
# source code directories # source code directories
set (directories set (directories
../../QtViewer ../../QtViewer
@@ -30,14 +27,14 @@ set (sources
acg_drop_templates (sources) acg_drop_templates (sources)
if (WIN32) 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 # 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 () else ()
acg_add_executable (${targetName} ${sources} ${headers} ) acg_add_executable (DecimaterGui ${sources} ${headers} )
endif () endif ()
target_link_libraries (${targetName} target_link_libraries (DecimaterGui
OpenMeshCore OpenMeshCore
OpenMeshTools OpenMeshTools
${QT_LIBRARIES} ${QT_LIBRARIES}

View File

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

View File

@@ -5,15 +5,13 @@ include_directories (
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
set (targetName Dualizer)
# collect all header and source files # collect all header and source files
acg_append_files (headers "*.hh" .) acg_append_files (headers "*.hh" .)
acg_append_files (sources "*.cc" .) 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 OpenMeshCore
OpenMeshTools OpenMeshTools
) )

View File

@@ -7,8 +7,6 @@ include_directories (
${QT_INCLUDE_DIR} ${QT_INCLUDE_DIR}
) )
set (targetName ProgViewer)
# collect all header and source files # collect all header and source files
acg_append_files (headers "*.hh" .) 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/QGLViewerWidget.hh")
list (APPEND headers "../QtViewer/MeshViewerWidgetT.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 # remove template cc files from source file list
acg_drop_templates (sources) acg_drop_templates (sources)
if (WIN32) 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 # 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 () else ()
acg_add_executable (${targetName} ${sources} ${headers}) acg_add_executable( ProgViewer ${sources} ${headers})
endif () endif ()
target_link_libraries (${targetName} target_link_libraries ( ProgViewer
OpenMeshCore OpenMeshCore
OpenMeshTools OpenMeshTools
${QT_LIBRARIES} ${QT_LIBRARIES}

View File

@@ -5,15 +5,13 @@ include_directories (
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
set (targetName Smoothing)
# collect all header and source files # collect all header and source files
acg_append_files (headers "*.hh" .) acg_append_files (headers "*.hh" .)
acg_append_files (sources "*.cc" .) 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 OpenMeshCore
OpenMeshTools OpenMeshTools
) )

View File

@@ -7,8 +7,6 @@ include_directories (
${QT_INCLUDE_DIR} ${QT_INCLUDE_DIR}
) )
set (targetName SubdividerGui)
# source code directories # source code directories
set (directories set (directories
../../QtViewer ../../QtViewer
@@ -29,14 +27,14 @@ set (sources
acg_drop_templates (sources) acg_drop_templates (sources)
if (WIN32) 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 # 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 () else ()
acg_add_executable (${targetName} ${sources} ${headers}) acg_add_executable (SubdividerGui ${sources} ${headers})
endif () endif ()
target_link_libraries (${targetName} target_link_libraries (SubdividerGui
OpenMeshCore OpenMeshCore
OpenMeshTools OpenMeshTools
${QT_LIBRARIES} ${QT_LIBRARIES}

View File

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

View File

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

View File

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

View File

@@ -7,8 +7,6 @@ include_directories (
${QT_INCLUDE_DIR} ${QT_INCLUDE_DIR}
) )
set (targetName Synthesizer)
# collect all header and source files # collect all header and source files
acg_append_files (headers "*.hh" .) acg_append_files (headers "*.hh" .)
acg_append_files (sources "*.cc" .) acg_append_files (sources "*.cc" .)
@@ -23,14 +21,14 @@ list (APPEND headers "../../QtViewer/MeshViewerWidgetT.hh")
acg_drop_templates (sources) acg_drop_templates (sources)
if (WIN32) 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 # 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 () else ()
acg_add_executable (${targetName} ${sources} ${headers}) acg_add_executable (Synthesizer ${sources} ${headers})
endif () endif ()
target_link_libraries (${targetName} target_link_libraries (Synthesizer
OpenMeshCore OpenMeshCore
OpenMeshTools OpenMeshTools
${QT_LIBRARIES} ${QT_LIBRARIES}

View File

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

View File

@@ -5,15 +5,13 @@ include_directories (
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
set (targetName mconvert)
# collect all header and source files # collect all header and source files
acg_append_files (headers "*.hh" .) acg_append_files (headers "*.hh" .)
acg_append_files (sources "*.cc" .) 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 OpenMeshCore
OpenMeshTools OpenMeshTools
) )