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

revert changes to cmakelist

Browse Source
This commit is contained in:
Johannes Lenzen
2021-05-03 13:55:10 +02:00
parent 3323f55f65
commit 362672c63c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@@ -85,7 +85,7 @@ if ( NOT DEFINED BUILD_APPS )
endif() endif()
# Only call fixbundle, when we are building OpenMesh standalone # Only call fixbundle, when we are building OpenMesh standalone
if( (${CMAKE_PROJECT_NAME} MATCHES "OpenMesh") AND BUILD_APPS AND QT_FOUND ) if( (${CMAKE_PROJECT_NAME} MATCHES "OpenMesh") AND BUILD_APPS )
if (WIN32) if (WIN32)
if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" AND BUILD_APPS ) if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" AND BUILD_APPS )
@@ -151,12 +151,12 @@ endif()
# Only call fixbundle, when we are building OpenMesh standalone # Only call fixbundle, when we are building OpenMesh standalone
if(${CMAKE_PROJECT_NAME} MATCHES "OpenMesh") if(${CMAKE_PROJECT_NAME} MATCHES "OpenMesh")
if (WIN32 AND BUILD_APPS AND QT_FOUND) if (WIN32 AND BUILD_APPS)
# prepare bundle generation cmake file and add a build target for it # prepare bundle generation cmake file and add a build target for it
configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/cmake/fixbundle.cmake.win.in" configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/cmake/fixbundle.cmake.win.in"
"${CMAKE_CURRENT_BINARY_DIR}/fixbundle.win.cmake" @ONLY IMMEDIATE) "${CMAKE_CURRENT_BINARY_DIR}/fixbundle.win.cmake" @ONLY IMMEDIATE)
if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles") if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" )
# let bundle generation depend on all targets # let bundle generation depend on all targets
add_dependencies (fixbundle QtViewer DecimaterGui) add_dependencies (fixbundle QtViewer DecimaterGui)
endif() endif()
@@ -164,7 +164,7 @@ if(${CMAKE_PROJECT_NAME} MATCHES "OpenMesh")
endif() endif()
# On apple we do a fixbundle, which is only necessary for the apps and not for the libs # On apple we do a fixbundle, which is only necessary for the apps and not for the libs
if (APPLE AND BUILD_APPS AND QT_FOUND) if (APPLE AND BUILD_APPS)
# prepare bundle generation cmake file and add a build target for it # prepare bundle generation cmake file and add a build target for it
configure_file ("${CMAKE_SOURCE_DIR}/cmake/fixbundle.cmake.in" configure_file ("${CMAKE_SOURCE_DIR}/cmake/fixbundle.cmake.in"
"${CMAKE_BINARY_DIR}/fixbundle.cmake" @ONLY IMMEDIATE) "${CMAKE_BINARY_DIR}/fixbundle.cmake" @ONLY IMMEDIATE)