From 362672c63c01c20fe6070a93319747dd4ac84e6f Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Mon, 3 May 2021 13:55:10 +0200 Subject: [PATCH] revert changes to cmakelist --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index adf761e5..fc804660 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,7 +85,7 @@ if ( NOT DEFINED BUILD_APPS ) endif() # 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 ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" AND BUILD_APPS ) @@ -151,12 +151,12 @@ endif() # Only call fixbundle, when we are building OpenMesh standalone 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 configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/cmake/fixbundle.cmake.win.in" "${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 add_dependencies (fixbundle QtViewer DecimaterGui) endif() @@ -164,7 +164,7 @@ if(${CMAKE_PROJECT_NAME} MATCHES "OpenMesh") endif() # 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 configure_file ("${CMAKE_SOURCE_DIR}/cmake/fixbundle.cmake.in" "${CMAKE_BINARY_DIR}/fixbundle.cmake" @ONLY IMMEDIATE)