From 09f778701d4adcd8a4e5386bea896b0c6a22213d Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Mon, 10 Feb 2020 11:53:33 +0100 Subject: [PATCH] Using default Info.plist (both qmake and cmake) --- src/meshlab/CMakeLists.txt | 8 ++++---- src/meshlab/meshlab.pro | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/meshlab/CMakeLists.txt b/src/meshlab/CMakeLists.txt index dea400cae..580f5a348 100644 --- a/src/meshlab/CMakeLists.txt +++ b/src/meshlab/CMakeLists.txt @@ -73,10 +73,10 @@ set(UI ui/savesnapshotDialog.ui) set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui) -if(APPLE) - list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../install/macx/info.plist - images/meshlab.icns) -endif() +#if(APPLE) +# list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../install/macx/info.plist +# images/meshlab.icns) +#endif() if(WIN32) list(APPEND SOURCES meshlab.rc) diff --git a/src/meshlab/meshlab.pro b/src/meshlab/meshlab.pro index 037c1b2f5..13c24d4f1 100644 --- a/src/meshlab/meshlab.pro +++ b/src/meshlab/meshlab.pro @@ -103,7 +103,7 @@ win32:RC_FILE = meshlab.rc # ## the xml info list # ## the next time the app open a new extension -QMAKE_INFO_PLIST = Info.plist +#QMAKE_INFO_PLIST = Info.plist # to add MacOS icon ICON = images/meshlab.icns @@ -139,7 +139,7 @@ macx:QMAKE_POST_LINK = "\ #CONFIG(release,debug | release) { # win32-msvc2005:release:LIBS += -L../common/release -lcommon # win32-msvc2008:release:LIBS += -L../common/release -lcommon -# win32-g++:release:LIBS += -L../common/release -lcommon +# win32-g++:release:LIBS += -L../common/release -lcommon #} linux:LIBS += \