From 1c0f4a4e30cd7af65f367a71954be7075c3ed75b Mon Sep 17 00:00:00 2001 From: Bernhard Stegmaier Date: Sun, 25 May 2014 11:02:52 -0500 Subject: [PATCH] mac fixes --- eeschema/CMakeLists.txt | 6 +++++- pcb_calculator/CMakeLists.txt | 9 --------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt index a57179691d..f857ed1891 100644 --- a/eeschema/CMakeLists.txt +++ b/eeschema/CMakeLists.txt @@ -191,9 +191,13 @@ if( APPLE ) set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/eeschema.icns" PROPERTIES MACOSX_PACKAGE_LOCATION Resources ) + set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/eeschema_doc.icns" PROPERTIES + MACOSX_PACKAGE_LOCATION Resources + ) set( MACOSX_BUNDLE_ICON_FILE eeschema.icns ) set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.eeschema ) + set( MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist ) endif() @@ -291,7 +295,7 @@ if( USE_KIWAY_DLLS ) add_dependencies( eeschema eeschema_kiface ) if( APPLE ) - set_target_properties( eeschema_kiface PROPERTIES + set_target_properties( eeschema PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist ) endif() diff --git a/pcb_calculator/CMakeLists.txt b/pcb_calculator/CMakeLists.txt index 8e1dad619c..b602c361cf 100644 --- a/pcb_calculator/CMakeLists.txt +++ b/pcb_calculator/CMakeLists.txt @@ -134,15 +134,6 @@ if( USE_KIWAY_DLLS ) ) endif() - if( APPLE ) - # copies kiface into the bundle - add_custom_target( _pcb_calculator_kiface_copy ALL - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/pcb_calculator/_pcb_calculator.kiface "${CMAKE_BINARY_DIR}/pcb_calculator/pcb_calculator.app/Contents/MacOS/" - DEPENDS pcb_calculator_kiface - COMMENT "Copying kiface into pcb_calculator" - ) - endif() - else() add_executable( pcb_calculator WIN32 MACOSX_BUNDLE