Skip to content

K
kicad-source-mirror
Commit ecbe6e08 authored by Dick Hollenbeck's avatar Dick Hollenbeck
Browse files
Options

Try some new Mac support ideas.

parent 190461f8
Hide whitespace changes
Inline Side-by-side
Showing with 274 additions and 373 deletions
cvpcb/CMakeLists.txt
View file @ ecbe6e08
...@@ -100,7 +100,6 @@ if( USE_KIWAY_DLLS ) ...@@ -100,7 +100,6 @@ if( USE_KIWAY_DLLS )
cvpcb.cpp cvpcb.cpp
${CVPCB_SRCS} ${CVPCB_SRCS}
${CVPCB_DIALOGS} ${CVPCB_DIALOGS}
# ${CVPCB_RESOURCES}
) )
set_target_properties( cvpcb_kiface PROPERTIES set_target_properties( cvpcb_kiface PROPERTIES
OUTPUT_NAME cvpcb OUTPUT_NAME cvpcb
...@@ -148,12 +147,6 @@ if( USE_KIWAY_DLLS ) ...@@ -148,12 +147,6 @@ if( USE_KIWAY_DLLS )
target_link_libraries( cvpcb_kiface rt ) target_link_libraries( cvpcb_kiface rt )
endif() endif()
if( APPLE )
set_target_properties( cvpcb PROPERTIES
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
)
endif()
set_source_files_properties( cvpcb.cpp PROPERTIES set_source_files_properties( cvpcb.cpp PROPERTIES
# The KIFACE is in cvpcb.cpp, export it: # The KIFACE is in cvpcb.cpp, export it:
COMPILE_DEFINITIONS "BUILD_KIWAY_DLL;COMPILING_DLL" COMPILE_DEFINITIONS "BUILD_KIWAY_DLL;COMPILING_DLL"
...@@ -172,18 +165,16 @@ if( USE_KIWAY_DLLS ) ...@@ -172,18 +165,16 @@ if( USE_KIWAY_DLLS )
DESTINATION ${KICAD_BIN} DESTINATION ${KICAD_BIN}
COMPONENT binary COMPONENT binary
) )
install( TARGETS cvpcb_kiface
DESTINATION ${KICAD_BIN}
COMPONENT binary
)
if( APPLE ) if( APPLE )
# copies kiface into the bundle # puts the *.kiface into the *.app bundle while linking
add_custom_target( _cvpcb_kiface_copy ALL set_target_properties( cvpcb_kiface PROPERTIES
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/cvpcb/_cvpcb.kiface "${CMAKE_BINARY_DIR}/cvpcb/cvpcb.app/Contents/MacOS/" LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/cvpcb.app/Contents/MacOS/
DEPENDS cvpcb_kiface )
COMMENT "Copying kiface into cvpcb" else()
) install( TARGETS cvpcb_kiface
DESTINATION ${KICAD_BIN}
COMPONENT binary
)
endif() endif()
else() else()
...@@ -228,15 +219,15 @@ else() ...@@ -228,15 +219,15 @@ else()
# Must follow github_plugin # Must follow github_plugin
target_link_libraries( cvpcb ${Boost_LIBRARIES} ) target_link_libraries( cvpcb ${Boost_LIBRARIES} )
if( APPLE )
set_target_properties( cvpcb PROPERTIES
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
)
endif()
install( TARGETS cvpcb install( TARGETS cvpcb
DESTINATION ${KICAD_BIN} DESTINATION ${KICAD_BIN}
COMPONENT binary COMPONENT binary
) )
endif()
if( APPLE )
set_target_properties( cvpcb PROPERTIES
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
)
endif() endif()
eeschema/CMakeLists.txt
View file @ ecbe6e08
...@@ -311,20 +311,18 @@ if( USE_KIWAY_DLLS ) ...@@ -311,20 +311,18 @@ if( USE_KIWAY_DLLS )
DESTINATION ${KICAD_BIN} DESTINATION ${KICAD_BIN}
COMPONENT binary COMPONENT binary
) )
install( TARGETS eeschema_kiface
# actual filename subject to change at milestone C)
# modular-kicad blueprint.
DESTINATION ${KICAD_BIN}
COMPONENT binary
)
if( APPLE ) if( APPLE )
# copies kiface into the bundle # puts the *.kiface into the *.app bundle while linking
add_custom_target( _eeschema_kiface_copy ALL set_target_properties( eeschema_kiface PROPERTIES
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/eeschema/_eeschema.kiface "${CMAKE_BINARY_DIR}/eeschema/eeschema.app/Contents/MacOS/" LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/eeschema.app/Contents/MacOS/
DEPENDS eeschema_kiface )
COMMENT "Copying kiface into eeschema" else()
) install( TARGETS eeschema_kiface
# actual filename subject to change at milestone C)
# modular-kicad blueprint.
DESTINATION ${KICAD_BIN}
COMPONENT binary
)
endif() endif()
else() else()
......
eeschema/Info.plist
View file @ ecbe6e08
...@@ -2,54 +2,36 @@ ...@@ -2,54 +2,36 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>CFBundleDocumentTypes</key> <key>CFBundleDocumentTypes</key>
<array> <array>
<dict> <dict>
<key>CFBundleTypeRole</key> <key>CFBundleTypeRole</key> <string>Editor</string>
<string>Editor</string> <key>CFBundleTypeExtensions</key>
<key>CFBundleTypeExtensions</key> <array>
<array> <string>sch</string>
<string>sch</string> </array>
</array>
<key>CFBundleTypeIconFile</key> <key>CFBundleTypeIconFile</key> <string>eeschema.icns</string>
<string>eeschema.icns</string> <key>CFBundleTypeName</key> <string>eeschema document</string>
<key>CFBundleTypeName</key> <key>LSHandlerRank</key> <string>Owner</string>
<string>eeschema document</string> </dict>
<key>LSHandlerRank</key> </array>
<string>Owner</string>
</dict> <key>CFBundleDevelopmentRegion</key> <string>English</string>
</array> <key>CFBundleExecutable</key> <string>eeschema</string>
<key>CFBundleDevelopmentRegion</key> <key>CFBundleGetInfoString</key> <string></string>
<string>English</string> <key>CFBundleIconFile</key> <string>eeschema.icns</string>
<key>CFBundleExecutable</key> <key>CFBundleIdentifier</key> <string>org.kicad-eda.eeschema</string>
<string>eeschema</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string>
<key>CFBundleGetInfoString</key> <key>CFBundleLongVersionString</key> <string></string>
<string></string> <key>CFBundleName</key> <string>EESchema</string>
<key>CFBundleIconFile</key> <key>CFBundlePackageType</key> <string>APPL</string>
<string>eeschema.icns</string> <key>CFBundleShortVersionString</key> <string></string>
<key>CFBundleIdentifier</key> <key>CFBundleSignature</key> <string>????</string>
<string>org.kicad-eda.eeschema</string> <key>CFBundleVersion</key> <string></string>
<key>CFBundleInfoDictionaryVersion</key> <key>CSResourcesFileMapped</key> <true/>
<string>6.0</string> <key>LSRequiresCarbon</key> <true/>
<key>CFBundleLongVersionString</key> <key>NSHumanReadableCopyright</key> <string></string>
<string></string> <key>NSHighResolutionCapable</key> <string>True</string>
<key>CFBundleName</key>
<string>EESchema</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string></string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string></string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
<true/>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>NSHighResolutionCapable</key>
<string>True</string>
</dict> </dict>
</plist> </plist>
gerbview/CMakeLists.txt
View file @ ecbe6e08
...@@ -81,11 +81,11 @@ endif() ...@@ -81,11 +81,11 @@ endif()
if( APPLE ) if( APPLE )
set(GERBVIEW_RESOURCES gerbview.icns gerbview_doc.icns) set( GERBVIEW_RESOURCES gerbview.icns gerbview_doc.icns )
set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/gerbview.icns" PROPERTIES set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/gerbview.icns" PROPERTIES
MACOSX_PACKAGE_LOCATION Resources MACOSX_PACKAGE_LOCATION Resources
) )
set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/gerbview_doc.icns" PROPERTIES set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/gerbview_doc.icns" PROPERTIES
MACOSX_PACKAGE_LOCATION Resources MACOSX_PACKAGE_LOCATION Resources
) )
set( MACOSX_BUNDLE_ICON_FILE gerbview.icns ) set( MACOSX_BUNDLE_ICON_FILE gerbview.icns )
...@@ -120,7 +120,6 @@ if( USE_KIWAY_DLLS ) ...@@ -120,7 +120,6 @@ if( USE_KIWAY_DLLS )
${GERBVIEW_SRCS} ${GERBVIEW_SRCS}
${DIALOGS_SRCS} ${DIALOGS_SRCS}
${GERBVIEW_EXTRA_SRCS} ${GERBVIEW_EXTRA_SRCS}
# ${GERBVIEW_RESOURCES}
) )
set_target_properties( gerbview_kiface PROPERTIES set_target_properties( gerbview_kiface PROPERTIES
OUTPUT_NAME gerbview OUTPUT_NAME gerbview
...@@ -152,18 +151,16 @@ if( USE_KIWAY_DLLS ) ...@@ -152,18 +151,16 @@ if( USE_KIWAY_DLLS )
DESTINATION ${KICAD_BIN} DESTINATION ${KICAD_BIN}
COMPONENT binary COMPONENT binary
) )
install( TARGETS gerbview_kiface
DESTINATION ${KICAD_BIN}
COMPONENT binary
)
if( APPLE ) if( APPLE )
# copies kiface into the bundle # puts the *.kiface into the *.app bundle while linking
add_custom_target( _gerbview_kiface_copy ALL set_target_properties( gerbview_kiface PROPERTIES
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/gerbview/_gerbview.kiface "${CMAKE_BINARY_DIR}/gerbview/gerbview.app/Contents/MacOS/" LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/gerbview.app/Contents/MacOS/
DEPENDS gerbview_kiface )
COMMENT "Copying kiface into gerbview" else()
) install( TARGETS gerbview_kiface
DESTINATION ${KICAD_BIN}
COMPONENT binary
)
endif() endif()
else() else()
...@@ -194,5 +191,3 @@ if( APPLE ) ...@@ -194,5 +191,3 @@ if( APPLE )
set_target_properties( gerbview PROPERTIES set_target_properties( gerbview PROPERTIES
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist) MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
endif() endif()
gerbview/Info.plist
View file @ ecbe6e08
...@@ -2,72 +2,54 @@ ...@@ -2,72 +2,54 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>CFBundleDocumentTypes</key> <key>CFBundleDocumentTypes</key>
<array> <array>
<dict> <dict>
<key>CFBundleTypeExtensions</key> <key>CFBundleTypeExtensions</key>
<array> <array>
<string>pen</string> <string>pen</string>
<string>gba</string> <string>gba</string>
<string>gbr</string> <string>gbr</string>
<string>gbx</string> <string>gbx</string>
<string>gbo</string> <string>gbo</string>
<string>gbl</string> <string>gbl</string>
<string>gtl</string> <string>gtl</string>
<string>gto</string> <string>gto</string>
<string>gta</string> <string>gta</string>
<string>gbp</string> <string>gbp</string>
<string>gbp</string> <string>gbp</string>
<string>gbs</string> <string>gbs</string>
<string>gts</string> <string>gts</string>
<string>gtp</string> <string>gtp</string>
<string>gbx</string> <string>gbx</string>
<string>lgr</string> <string>lgr</string>
<string>ger</string> <string>ger</string>
<string>pho</string> <string>pho</string>
<string>drl</string> <string>drl</string>
</array> </array>
<key>CFBundleTypeIconFile</key>
<string>gerbview_doc.icns</string> <key>CFBundleTypeIconFile</key> <string>gerbview_doc.icns</string>
<key>CFBundleTypeName</key> <key>CFBundleTypeName</key> <string>gerbview document</string>
<string>gerbview document</string> <key>LSHandlerRank</key> <string>Default</string>
<key>LSHandlerRank</key> <key>CFBundleTypeRole</key> <string>Viewer</string>
<string>Default</string> </dict>
<key>CFBundleTypeRole</key> </array>
<string>Viewer</string>
</dict> <key>CFBundleDevelopmentRegion</key> <string>English</string>
</array> <key>CFBundleExecutable</key> <string>gerbview</string>
<key>CFBundleDevelopmentRegion</key> <key>CFBundleGetInfoString</key> <string></string>
<string>English</string> <key>CFBundleIconFile</key> <string>gerbview.icns</string>
<key>CFBundleExecutable</key> <key>CFBundleIdentifier</key> <string>org.kicad-eda.gerbview</string>
<string>gerbview</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string>
<key>CFBundleGetInfoString</key> <key>CFBundleLongVersionString</key> <string></string>
<string></string> <key>CFBundleName</key> <string>GerbView</string>
<key>CFBundleIconFile</key> <key>CFBundlePackageType</key> <string>APPL</string>
<string>gerbview.icns</string> <key>CFBundleShortVersionString</key> <string></string>
<key>CFBundleIdentifier</key> <key>CFBundleSignature</key> <string>????</string>
<string>org.kicad-eda.gerbview</string> <key>CFBundleVersion</key> <string></string>
<key>CFBundleInfoDictionaryVersion</key> <key>CSResourcesFileMapped</key> <true/>
<string>6.0</string> <key>LSRequiresCarbon</key> <true/>
<key>CFBundleLongVersionString</key> <key>NSHumanReadableCopyright</key> <string></string>
<string></string> <key>NSHighResolutionCapable</key> <string>True</string>
<key>CFBundleName</key>
<string>GerbView</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string></string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string></string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
<true/>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>NSHighResolutionCapable</key>
<string>True</string>
</dict> </dict>
</plist> </plist>
kicad/CMakeLists.txt
View file @ ecbe6e08
...@@ -57,6 +57,22 @@ if( UNIX ) ...@@ -57,6 +57,22 @@ if( UNIX )
endif() endif()
if( APPLE )
# In this CMakeLists.txt's build directory, create kiface symlinks should get
# "installed()" as part of the kicad.app bundle. These are pointers on the
# target which point up and over to the stand alone kicad app's *.kiface files.
foreach( symlink pcbnew eeschema cvpcb )
add_custom_command( TARGET kicad
COMMAND ${CMAKE_COMMAND} -E remove
"${CMAKE_CURRENT_BINARY_DIR}/kicad.app/Contents/MacOS/_${symlink}.kiface"
COMMAND ${CMAKE_COMMAND} -E create_symlink
"../../../${symlink}.app/Contents/MacOS/_${symlink}.kiface"
"${CMAKE_CURRENT_BINARY_DIR}/kicad.app/Contents/MacOS/_${symlink}.kiface"
COMMENT "kicad.app ${symlink} symlink"
)
endforeach()
endif()
if( APPLE ) if( APPLE )
set_target_properties( kicad PROPERTIES set_target_properties( kicad PROPERTIES
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
......
kicad/Info.plist
View file @ ecbe6e08
...@@ -2,54 +2,36 @@ ...@@ -2,54 +2,36 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>CFBundleDocumentTypes</key> <key>CFBundleDocumentTypes</key>
<array> <array>
<dict> <dict>
<key>CFBundleTypeRole</key> <key>CFBundleTypeRole</key> <string>Editor</string>
<string>Editor</string> <key>CFBundleTypeIconFile</key> <string>kicad_doc.icns</string>
<key>CFBundleTypeIconFile</key>
<string>kicad_doc.icns</string> <key>CFBundleTypeExtensions</key> <array>
<key>CFBundleTypeExtensions</key> <string>pro</string>
<array> </array>
<string>pro</string>
</array> <key>CFBundleTypeName</key> <string>kicad project files</string>
<key>CFBundleTypeName</key> <key>LSHandlerRank</key> <string>Owner</string>
<string>kicad project files</string> </dict>
<key>LSHandlerRank</key> </array>
<string>Owner</string>
</dict> <key>CFBundleDevelopmentRegion</key> <string>English</string>
</array> <key>CFBundleExecutable</key> <string>kicad</string>
<key>CFBundleDevelopmentRegion</key> <key>CFBundleGetInfoString</key> <string></string>
<string>English</string> <key>CFBundleIconFile</key> <string>kicad.icns</string>
<key>CFBundleExecutable</key> <key>CFBundleIdentifier</key> <string>org.kicad-eda.kicad</string>
<string>kicad</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string>
<key>CFBundleGetInfoString</key> <key>CFBundleLongVersionString</key> <string></string>
<string></string> <key>CFBundleName</key> <string>KiCad</string>
<key>CFBundleIconFile</key> <key>CFBundlePackageType</key> <string>APPL</string>
<string>kicad.icns</string> <key>CFBundleShortVersionString</key> <string></string>
<key>CFBundleIdentifier</key> <key>CFBundleSignature</key> <string>????</string>
<string>org.kicad-eda.kicad</string> <key>CFBundleVersion</key> <string></string>
<key>CFBundleInfoDictionaryVersion</key> <key>CSResourcesFileMapped</key> <true/>
<string>6.0</string> <key>LSRequiresCarbon</key> <true/>
<key>CFBundleLongVersionString</key> <key>NSHumanReadableCopyright</key> <string></string>
<string></string> <key>NSHighResolutionCapable</key> <string>True</string>
<key>CFBundleName</key>
<string>KiCad</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string></string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string></string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
<true/>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>NSHighResolutionCapable</key>
<string>True</string>
</dict> </dict>
</plist> </plist>
pagelayout_editor/CMakeLists.txt
View file @ ecbe6e08
...@@ -49,7 +49,20 @@ set( PL_EDITOR_EXTRA_SRCS ...@@ -49,7 +49,20 @@ set( PL_EDITOR_EXTRA_SRCS
if( MINGW ) if( MINGW )
# PL_EDITOR_RESOURCES variable is set by the macro. # PL_EDITOR_RESOURCES variable is set by the macro.
mingw_resource_compiler(pl_editor) mingw_resource_compiler( pl_editor )
endif()
if( APPLE )
set( PL_EDITOR_RESOURCES pl_editor.icns pl_editor_doc.icns )
set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/pl_editor.icns" PROPERTIES
MACOSX_PACKAGE_LOCATION Resources
)
set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/pl_editor_doc.icns" PROPERTIES
MACOSX_PACKAGE_LOCATION Resources
)
set( MACOSX_BUNDLE_ICON_FILE pl_editor.icns )
set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.pl_editor )
endif() endif()
...@@ -82,7 +95,6 @@ if( USE_KIWAY_DLLS ) ...@@ -82,7 +95,6 @@ if( USE_KIWAY_DLLS )
${PL_EDITOR_SRCS} ${PL_EDITOR_SRCS}
${DIALOGS_SRCS} ${DIALOGS_SRCS}
${PL_EDITOR_EXTRA_SRCS} ${PL_EDITOR_EXTRA_SRCS}
# ${PL_EDITOR_RESOURCES}
) )
target_link_libraries( pl_editor_kiface target_link_libraries( pl_editor_kiface
common common
...@@ -114,18 +126,16 @@ if( USE_KIWAY_DLLS ) ...@@ -114,18 +126,16 @@ if( USE_KIWAY_DLLS )
DESTINATION ${KICAD_BIN} DESTINATION ${KICAD_BIN}
COMPONENT binary COMPONENT binary
) )
install( TARGETS pl_editor_kiface
DESTINATION ${KICAD_BIN}
COMPONENT binary
)
if( APPLE ) if( APPLE )
# copies kiface into the bundle # puts the *.kiface into the *.app bundle while linking
add_custom_target( _pleditor_kiface_copy ALL set_target_properties( pl_editor_kiface PROPERTIES
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/pagelayout_editor/_pl_editor.kiface "${CMAKE_BINARY_DIR}/pagelayout_editor/pl_editor.app/Contents/MacOS/" LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/pl_editor.app/Contents/MacOS/
DEPENDS pl_editor_kiface )
COMMENT "Copying kiface into pleditor" else()
) install( TARGETS pl_editor_kiface
DESTINATION ${KICAD_BIN}
COMPONENT binary
)
endif() endif()
else() else()
...@@ -137,13 +147,6 @@ else() ...@@ -137,13 +147,6 @@ else()
${PL_EDITOR_EXTRA_SRCS} ${PL_EDITOR_EXTRA_SRCS}
${PL_EDITOR_RESOURCES} ${PL_EDITOR_RESOURCES}
) )
if( APPLE )
set_target_properties( pl_editor PROPERTIES
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
)
endif()
target_link_libraries( pl_editor target_link_libraries( pl_editor
common common
polygon polygon
...@@ -152,28 +155,15 @@ else() ...@@ -152,28 +155,15 @@ else()
${wxWidgets_LIBRARIES} ${wxWidgets_LIBRARIES}
${GDI_PLUS_LIBRARIES} ${GDI_PLUS_LIBRARIES}
) )
install( TARGETS pl_editor install( TARGETS pl_editor
DESTINATION ${KICAD_BIN} DESTINATION ${KICAD_BIN}
COMPONENT binary COMPONENT binary
) )
endif() endif()
if( APPLE ) if( APPLE )
set( PL_EDITOR_RESOURCES pl_editor.icns pl_editor_doc.icns )
set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/pl_editor.icns" PROPERTIES
MACOSX_PACKAGE_LOCATION Resources
)
set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/pl_editor_doc.icns" PROPERTIES
MACOSX_PACKAGE_LOCATION Resources
)
set( MACOSX_BUNDLE_ICON_FILE pl_editor.icns )
set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.pl_editor )
set_target_properties( pl_editor PROPERTIES set_target_properties( pl_editor PROPERTIES
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
) )
endif() endif()
pagelayout_editor/Info.plist
View file @ ecbe6e08
...@@ -2,54 +2,36 @@ ...@@ -2,54 +2,36 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>CFBundleDocumentTypes</key> <key>CFBundleDocumentTypes</key>
<array> <array>
<dict> <dict>
<key>CFBundleTypeRole</key> <key>CFBundleTypeRole</key> <string>Editor</string>
<string>Editor</string> <key>CFBundleTypeExtensions</key>
<key>CFBundleTypeExtensions</key> <array>
<array> <string>kicad_wks</string>
<string>kicad_wks</string> </array>
</array>
<key>CFBundleTypeIconFile</key> <key>CFBundleTypeIconFile</key> <string>pl_editor.icns</string>
<string>pl_editor.icns</string> <key>CFBundleTypeName</key> <string>pl_editor document</string>
<key>CFBundleTypeName</key> <key>LSHandlerRank</key> <string>Owner</string>
<string>pl_editor document</string> </dict>
<key>LSHandlerRank</key> </array>
<string>Owner</string>
</dict> <key>CFBundleDevelopmentRegion</key> <string>English</string>
</array> <key>CFBundleExecutable</key> <string>pl_editor</string>
<key>CFBundleDevelopmentRegion</key> <key>CFBundleGetInfoString</key> <string></string>
<string>English</string> <key>CFBundleIconFile</key> <string>pl_editor.icns</string>
<key>CFBundleExecutable</key> <key>CFBundleIdentifier</key> <string>org.kicad-eda.pl_editor</string>
<string>pl_editor</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string>
<key>CFBundleGetInfoString</key> <key>CFBundleLongVersionString</key> <string></string>
<string></string> <key>CFBundleName</key> <string>pl_editor</string>
<key>CFBundleIconFile</key> <key>CFBundlePackageType</key> <string>APPL</string>
<string>pl_editor.icns</string> <key>CFBundleShortVersionString</key> <string></string>
<key>CFBundleIdentifier</key> <key>CFBundleSignature</key> <string>????</string>
<string>org.kicad-eda.pl_editor</string> <key>CFBundleVersion</key> <string></string>
<key>CFBundleInfoDictionaryVersion</key> <key>CSResourcesFileMapped</key> <true/>
<string>6.0</string> <key>LSRequiresCarbon</key> <true/>
<key>CFBundleLongVersionString</key> <key>NSHumanReadableCopyright</key> <string></string>
<string></string> <key>NSHighResolutionCapable</key> <string>True</string>
<key>CFBundleName</key>
<string>pl_editor</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string></string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string></string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
<true/>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>NSHighResolutionCapable</key>
<string>True</string>
</dict> </dict>
</plist> </plist>
pcb_calculator/CMakeLists.txt
View file @ ecbe6e08
...@@ -122,14 +122,15 @@ if( USE_KIWAY_DLLS ) ...@@ -122,14 +122,15 @@ if( USE_KIWAY_DLLS )
DESTINATION ${KICAD_BIN} DESTINATION ${KICAD_BIN}
COMPONENT binary COMPONENT binary
) )
install( TARGETS pcb_calculator_kiface
DESTINATION ${KICAD_BIN}
COMPONENT binary
)
if( APPLE ) if( APPLE )
set_target_properties( pcb_calculator PROPERTIES # puts the *.kiface into the *.app bundle while linking
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist set_target_properties( pcb_calculator_kiface PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/pcb_calculator.app/Contents/MacOS/
)
else()
install( TARGETS pcb_calculator_kiface
DESTINATION ${KICAD_BIN}
COMPONENT binary
) )
endif() endif()
...@@ -156,13 +157,6 @@ else() ...@@ -156,13 +157,6 @@ else()
set_source_files_properties( pcb_calculator.cpp PROPERTIES set_source_files_properties( pcb_calculator.cpp PROPERTIES
COMPILE_DEFINITIONS "COMPILING_DLL" COMPILE_DEFINITIONS "COMPILING_DLL"
) )
if( APPLE )
set_target_properties( pcb_calculator PROPERTIES
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
)
endif()
target_link_libraries( pcb_calculator target_link_libraries( pcb_calculator
common common
bitmaps bitmaps
...@@ -175,3 +169,10 @@ else() ...@@ -175,3 +169,10 @@ else()
) )
endif() endif()
if( APPLE )
set_target_properties( pcb_calculator PROPERTIES
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
)
endif()
pcbnew/CMakeLists.txt
View file @ ecbe6e08
...@@ -589,17 +589,15 @@ if( USE_KIWAY_DLLS ) ...@@ -589,17 +589,15 @@ if( USE_KIWAY_DLLS )
DESTINATION ${KICAD_BIN} DESTINATION ${KICAD_BIN}
COMPONENT binary COMPONENT binary
) )
install( TARGETS pcbnew_kiface
DESTINATION ${KICAD_BIN}
COMPONENT binary
)
if( APPLE ) if( APPLE )
# copies kiface into the bundle # puts the *.kiface into the *.app bundle while linking
add_custom_target( _pcbnew_kiface_copy ALL set_target_properties( pcbnew_kiface PROPERTIES
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/pcbnew/_pcbnew.kiface "${CMAKE_BINARY_DIR}/pcbnew/pcbnew.app/Contents/MacOS/" LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/pcbnew.app/Contents/MacOS/
DEPENDS pcbnew_kiface )
COMMENT "Copying kiface into pcbnew" else()
install( TARGETS pcbnew_kiface
DESTINATION ${KICAD_BIN}
COMPONENT binary
) )
endif() endif()
...@@ -763,3 +761,4 @@ if( false ) # haven't been used in years. ...@@ -763,3 +761,4 @@ if( false ) # haven't been used in years.
) )
target_link_libraries( layer_widget_test common ${wxWidgets_LIBRARIES} ) target_link_libraries( layer_widget_test common ${wxWidgets_LIBRARIES} )
endif() endif()
pcbnew/Info.plist
View file @ ecbe6e08
...@@ -2,53 +2,36 @@ ...@@ -2,53 +2,36 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>CFBundleDocumentTypes</key> <key>CFBundleDocumentTypes</key>
<array> <array>
<dict> <dict>
<key>CFBundleTypeRole</key> <key>CFBundleTypeRole</key> <string>Editor</string>
<string>Editor</string> <key>CFBundleTypeIconFile</key> <string>pcbnew_doc.icns</string>
<key>CFBundleTypeIconFile</key> <key>CFBundleTypeExtensions</key>
<string>pcbnew_doc.icns</string> <array>
<key>CFBundleTypeExtensions</key> <string>kicad_pcb</string>
<array> <string>brd</string>
<string>kicad_pcb</string> </array>
<string>brd</string>
</array> <key>CFBundleTypeName</key> <string>pcbnew board</string>
<key>CFBundleTypeName</key> <key>LSHandlerRank</key> <string>Owner</string>
<string>pcbnew board</string> </dict>
<key>LSHandlerRank</key> </array>
<string>Owner</string>
</dict> <key>CFBundleExecutable</key> <string>pcbnew</string>
</array> <key>CFBundleGetInfoString</key> <string></string>
<key>CFBundleExecutable</key> <key>CFBundleIconFile</key> <string>pcbnew.icns</string>
<string>pcbnew</string> <key>CFBundleIdentifier</key> <string>org.kicad-eda.pcbnew</string>
<key>CFBundleGetInfoString</key> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string>
<string></string> <key>CFBundleLongVersionString</key> <string></string>
<key>CFBundleIconFile</key> <key>CFBundleName</key> <string>PCBNew</string>
<string>pcbnew.icns</string> <key>CFBundlePackageType</key> <string>APPL</string>
<key>CFBundleIdentifier</key> <key>CFBundleShortVersionString</key> <string></string>
<string>org.kicad-eda.pcbnew</string> <key>CFBundleSignature</key> <string>????</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleVersion</key> <string></string>
<string>6.0</string> <key>CSResourcesFileMapped</key> <true/>
<key>CFBundleLongVersionString</key> <key>LSRequiresCarbon</key> <true/>
<string></string> <key>NSHumanReadableCopyright</key> <string></string>
<key>CFBundleName</key> <key>NSHighResolutionCapable</key> <string>True</string>
<string>PCBNew</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string></string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string></string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
<true/>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>NSHighResolutionCapable</key>
<string>True</string>
</dict> </dict>
</plist> </plist>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment