From 4db450347cd94e27e3aaab7252cd3faf8772eecd Mon Sep 17 00:00:00 2001 From: Peter Eszlari Date: Mon, 30 Nov 2020 18:45:39 +0100 Subject: [PATCH 1/3] cmake: remove OLIVE_TARGET variable --- app/CMakeLists.txt | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 995c75d92..dd8f6b502 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -50,11 +50,7 @@ add_subdirectory(undo) add_subdirectory(widget) add_subdirectory(window) -# Create main application target -set(OLIVE_TARGET "olive-editor") if(APPLE) - set(OLIVE_TARGET "Olive") - set(OLIVE_ICON packaging/macos/olive.icns) set(OLIVE_RESOURCES @@ -79,17 +75,18 @@ set(OLIVE_RESOURCES ) # Add executable -add_executable(${OLIVE_TARGET} +add_executable(olive-editor ${OLIVE_SOURCES} ${OLIVE_RESOURCES} ) if(APPLE) - set_target_properties(${OLIVE_TARGET} PROPERTIES + set_target_properties(olive-editor PROPERTIES MACOSX_BUNDLE TRUE MACOSX_BUNDLE_GUI_IDENTIFIER org.olivevideoeditor.Olive MACOSX_BUNDLE_ICON_FILE olive.icns RESOURCE "${OLIVE_ICON}" + OUTPUT_NAME "Olive" ) set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9") @@ -98,7 +95,7 @@ endif() # Set compiler options if(MSVC) target_compile_options( - ${OLIVE_TARGET} + olive-editor PRIVATE /WX /wd4267 @@ -111,7 +108,7 @@ if(MSVC) ) else() target_compile_options( - ${OLIVE_TARGET} + olive-editor PRIVATE "$<$:-O2>" -Werror @@ -126,7 +123,7 @@ endif() if(UNIX AND NOT APPLE) target_link_options( - ${OLIVE_TARGET} + olive-editor PRIVATE -rdynamic ) @@ -134,7 +131,7 @@ endif() # Set include directories target_include_directories( - ${OLIVE_TARGET} + olive-editor PRIVATE ${FFMPEG_INCLUDE_DIRS} ${OCIO_INCLUDE_DIRS} @@ -149,7 +146,7 @@ target_include_directories( # Set link libraries target_link_libraries( - ${OLIVE_TARGET} + olive-editor PRIVATE Qt5::Core Qt5::Gui @@ -172,13 +169,13 @@ target_link_libraries( if (WIN32) target_link_libraries( - ${OLIVE_TARGET} + olive-editor PRIVATE DbgHelp ) elseif (APPLE) target_link_libraries( - ${OLIVE_TARGET} + olive-editor PRIVATE "-framework ApplicationServices" ) @@ -189,20 +186,20 @@ if (OpenTimelineIO_FOUND) set(OLIVE_DEFINITIONS ${OLIVE_DEFINITIONS} USE_OTIO) target_include_directories( - ${OLIVE_TARGET} + olive-editor PRIVATE ${OTIO_INCLUDE_DIRS} ) target_link_libraries( - ${OLIVE_TARGET} + olive-editor PRIVATE ${OTIO_LIBRARIES} ) endif() if(UNIX AND NOT APPLE) - install(TARGETS ${OLIVE_TARGET} RUNTIME DESTINATION bin) + install(TARGETS olive-editor RUNTIME DESTINATION bin) endif() # Enable Crashpad if found @@ -210,13 +207,13 @@ if (GoogleCrashpad_FOUND) set(OLIVE_DEFINITIONS ${OLIVE_DEFINITIONS} USE_CRASHPAD) target_include_directories( - ${OLIVE_TARGET} + olive-editor PRIVATE ${CRASHPAD_INCLUDE_DIRS} ) target_link_libraries( - ${OLIVE_TARGET} + olive-editor PRIVATE ${CRASHPAD_LIBRARIES} ) @@ -270,15 +267,15 @@ if (GoogleCrashpad_FOUND) if(APPLE) # Move crash handler executables inside Mac app bundle add_custom_command(TARGET ${OLIVE_CRASH_TARGET} POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${OLIVE_CRASH_TARGET} $ - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CRASHPAD_LIBRARY_DIRS}/${CRASHPAD_HANDLER} $ - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${BREAKPAD_BIN_DIR}/${MINIDUMP_STACKWALK} $ + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${OLIVE_CRASH_TARGET} $ + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CRASHPAD_LIBRARY_DIRS}/${CRASHPAD_HANDLER} $ + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${BREAKPAD_BIN_DIR}/${MINIDUMP_STACKWALK} $ ) endif() endif() # Set compiler definitions -target_compile_definitions(${OLIVE_TARGET} PRIVATE ${OLIVE_DEFINITIONS}) +target_compile_definitions(olive-editor PRIVATE ${OLIVE_DEFINITIONS}) add_subdirectory(packaging) From 4dac8147210d216ecea7229feb94b06292f06f6b Mon Sep 17 00:00:00 2001 From: Peter Eszlari Date: Mon, 30 Nov 2020 19:07:11 +0100 Subject: [PATCH 2/3] move plist to packaging/ --- app/CMakeLists.txt | 1 + {cmake => app/packaging/macos}/MacOSXBundleInfo.plist.in | 0 2 files changed, 1 insertion(+) rename {cmake => app/packaging/macos}/MacOSXBundleInfo.plist.in (100%) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index dd8f6b502..3eb4272a2 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -83,6 +83,7 @@ add_executable(olive-editor if(APPLE) set_target_properties(olive-editor PROPERTIES MACOSX_BUNDLE TRUE + MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/packaging/macos/MacOSXBundleInfo.plist.in MACOSX_BUNDLE_GUI_IDENTIFIER org.olivevideoeditor.Olive MACOSX_BUNDLE_ICON_FILE olive.icns RESOURCE "${OLIVE_ICON}" diff --git a/cmake/MacOSXBundleInfo.plist.in b/app/packaging/macos/MacOSXBundleInfo.plist.in similarity index 100% rename from cmake/MacOSXBundleInfo.plist.in rename to app/packaging/macos/MacOSXBundleInfo.plist.in From 36d3524daf46adec7c723dc29beedccbc2bb819f Mon Sep 17 00:00:00 2001 From: Peter Eszlari Date: Mon, 30 Nov 2020 19:13:15 +0100 Subject: [PATCH 3/3] cmake: set CMAKE_OSX_DEPLOYMENT_TARGET in ci.yml --- .github/workflows/ci.yml | 2 +- CMakeLists.txt | 2 -- app/CMakeLists.txt | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e120e18fa..c30f0d6ab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -359,7 +359,7 @@ jobs: working-directory: ${{ runner.workspace }}/build run: | PATH=$GITHUB_WORKSPACE:$PATH \ - cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G "${{ matrix.cmake-gen }}" + cmake $GITHUB_WORKSPACE -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -G "${{ matrix.cmake-gen }}" - name: Build working-directory: ${{ runner.workspace }}/build diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b6312bec..778bda302 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,8 +29,6 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) -set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13") - set(OLIVE_DEFINITIONS -DAPPVERSION="${PROJECT_VERSION}" -DQT_DEPRECATED_WARNINGS) list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 3eb4272a2..b7331ca43 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -89,8 +89,6 @@ if(APPLE) RESOURCE "${OLIVE_ICON}" OUTPUT_NAME "Olive" ) - - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9") endif() # Set compiler options