haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mac fixes

This commit is contained in:
Bernhard Stegmaier 2014-05-25 11:02:52 -05:00 committed by Dick Hollenbeck
parent 3087c05a5d
commit 0d5c7f4461
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eeschema/CMakeLists.txt
View File

@ -191,9 +191,13 @@ if( APPLE )
set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/eeschema.icns" PROPERTIES set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/eeschema.icns" PROPERTIES
MACOSX_PACKAGE_LOCATION Resources 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_ICON_FILE eeschema.icns )
set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.eeschema ) set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.eeschema )
set( MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist )
endif() endif()
@ -291,7 +295,7 @@ if( USE_KIWAY_DLLS )
add_dependencies( eeschema eeschema_kiface ) add_dependencies( eeschema eeschema_kiface )
if( APPLE ) if( APPLE )
set_target_properties( eeschema_kiface PROPERTIES set_target_properties( eeschema PROPERTIES
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
) )
endif() endif()

9
pcb_calculator/CMakeLists.txt
View File

@ -134,15 +134,6 @@ if( USE_KIWAY_DLLS )
) )
endif() 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() else()
add_executable( pcb_calculator WIN32 MACOSX_BUNDLE add_executable( pcb_calculator WIN32 MACOSX_BUNDLE