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

Merge branch 'More_QT_Cleanup' into 'master'

Browse Source 
Reduce Qt footprint even more

See merge request OpenMesh/OpenMesh!203
This commit is contained in:
Jan Möbius
2018-12-14 17:50:24 +01:00
parent 2601ce4e7d 0beeb7f9c1
commit 90db9c7c30
6 changed files with 26 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,6 @@ include_directories (
../../../..
${CMAKE_CURRENT_SOURCE_DIR}
${GLUT_INCLUDE_DIR}
${QT_INCLUDE_DIR}
)
# source code directories
@@ -28,8 +27,6 @@ acg_drop_templates (sources)
if (WIN32)
acg_add_executable (DecimaterGui WIN32 ${sources} ${headers})
# link to qtmain library to get WinMain function for a non terminal app
target_link_libraries (DecimaterGui ${QT_QTMAIN_LIBRARY})
else ()
acg_add_executable (DecimaterGui ${sources} ${headers} )
endif ()
@@ -37,7 +34,7 @@ endif ()
target_link_libraries (DecimaterGui
OpenMeshCore
OpenMeshTools
${QT_LIBRARIES}
Qt5::OpenGL
${OPENGL_LIBRARIES}
${GLUT_LIBRARIES}
)

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

@@ -4,7 +4,6 @@ include_directories (
../../..
${CMAKE_CURRENT_SOURCE_DIR}
${GLUT_INCLUDE_DIR}
${QT_INCLUDE_DIR}
)
@@ -23,8 +22,6 @@ acg_drop_templates (sources)
if (WIN32)
acg_add_executable( ProgViewer WIN32 ${sources} ${headers})
# link to qtmain library to get WinMain function for a non terminal app
target_link_libraries( ProgViewer ${QT_QTMAIN_LIBRARY})
else ()
acg_add_executable( ProgViewer ${sources} ${headers})
endif ()
@@ -32,7 +29,7 @@ endif ()
target_link_libraries ( ProgViewer
OpenMeshCore
OpenMeshTools
${QT_LIBRARIES}
Qt5::OpenGL
${OPENGL_LIBRARIES}
${GLUT_LIBRARIES}
)

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

@@ -4,7 +4,6 @@ include_directories (
../../..
${CMAKE_CURRENT_SOURCE_DIR}
${GLUT_INCLUDE_DIR}
${QT_INCLUDE_DIR}
)
# source code directories
@@ -21,8 +20,6 @@ acg_drop_templates (sources)
if (WIN32)
acg_add_executable (QtViewer WIN32 ${sources} ${headers})
# link to qtmain library to get WinMain function for a non terminal app
target_link_libraries (QtViewer ${QT_QTMAIN_LIBRARY})
else ()
acg_add_executable (QtViewer ${sources} ${headers})
endif ()
@@ -30,7 +27,7 @@ endif ()
target_link_libraries (QtViewer
OpenMeshCore
OpenMeshTools
${QT_LIBRARIES}
Qt5::OpenGL
${OPENGL_LIBRARIES}
${GLUT_LIBRARIES}
)

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

@@ -4,7 +4,6 @@ include_directories (
../../../..
${CMAKE_CURRENT_SOURCE_DIR}
${GLUT_INCLUDE_DIR}
${QT_INCLUDE_DIR}
)
# source code directories
@@ -28,8 +27,6 @@ acg_drop_templates (sources)
if (WIN32)
acg_add_executable (SubdividerGui WIN32 ${sources} ${headers})
# link to qtmain library to get WinMain function for a non terminal app
target_link_libraries (SubdividerGui ${QT_QTMAIN_LIBRARY})
else ()
acg_add_executable (SubdividerGui ${sources} ${headers})
endif ()
@@ -37,7 +34,7 @@ endif ()
target_link_libraries (SubdividerGui
OpenMeshCore
OpenMeshTools
${QT_LIBRARIES}
Qt5::OpenGL
${OPENGL_LIBRARIES}
${GLUT_LIBRARIES}
)

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

@@ -4,7 +4,6 @@ include_directories (
../../../..
${CMAKE_CURRENT_SOURCE_DIR}
${GLUT_INCLUDE_DIR}
${QT_INCLUDE_DIR}
)
# collect all header and source files
@@ -22,8 +21,6 @@ acg_drop_templates (sources)
if (WIN32)
acg_add_executable (Synthesizer WIN32 ${sources} ${headers})
# link to qtmain library to get WinMain function for a non terminal app
target_link_libraries (Synthesizer ${QT_QTMAIN_LIBRARY})
else ()
acg_add_executable (Synthesizer ${sources} ${headers})
endif ()
@@ -31,7 +28,7 @@ endif ()
target_link_libraries (Synthesizer
OpenMeshCore
OpenMeshTools
${QT_LIBRARIES}
Qt5::OpenGL
${OPENGL_LIBRARIES}
${GLUT_LIBRARIES}
)