Try some new Mac support ideas.
This commit is contained in:
parent
0166c95efd
commit
c855824337
|
@ -100,7 +100,6 @@ if( USE_KIWAY_DLLS )
|
|||
cvpcb.cpp
|
||||
${CVPCB_SRCS}
|
||||
${CVPCB_DIALOGS}
|
||||
# ${CVPCB_RESOURCES}
|
||||
)
|
||||
set_target_properties( cvpcb_kiface PROPERTIES
|
||||
OUTPUT_NAME cvpcb
|
||||
|
@ -148,12 +147,6 @@ if( USE_KIWAY_DLLS )
|
|||
target_link_libraries( cvpcb_kiface rt )
|
||||
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
|
||||
# The KIFACE is in cvpcb.cpp, export it:
|
||||
COMPILE_DEFINITIONS "BUILD_KIWAY_DLL;COMPILING_DLL"
|
||||
|
@ -172,18 +165,16 @@ if( USE_KIWAY_DLLS )
|
|||
DESTINATION ${KICAD_BIN}
|
||||
COMPONENT binary
|
||||
)
|
||||
if( APPLE )
|
||||
# puts the *.kiface into the *.app bundle while linking
|
||||
set_target_properties( cvpcb_kiface PROPERTIES
|
||||
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/cvpcb.app/Contents/MacOS/
|
||||
)
|
||||
else()
|
||||
install( TARGETS cvpcb_kiface
|
||||
DESTINATION ${KICAD_BIN}
|
||||
COMPONENT binary
|
||||
)
|
||||
|
||||
if( APPLE )
|
||||
# copies kiface into the bundle
|
||||
add_custom_target( _cvpcb_kiface_copy ALL
|
||||
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/cvpcb/_cvpcb.kiface "${CMAKE_BINARY_DIR}/cvpcb/cvpcb.app/Contents/MacOS/"
|
||||
DEPENDS cvpcb_kiface
|
||||
COMMENT "Copying kiface into cvpcb"
|
||||
)
|
||||
endif()
|
||||
|
||||
else()
|
||||
|
@ -228,15 +219,15 @@ else()
|
|||
# Must follow github_plugin
|
||||
target_link_libraries( cvpcb ${Boost_LIBRARIES} )
|
||||
|
||||
install( TARGETS cvpcb
|
||||
DESTINATION ${KICAD_BIN}
|
||||
COMPONENT binary
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
if( APPLE )
|
||||
set_target_properties( cvpcb PROPERTIES
|
||||
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
|
||||
)
|
||||
endif()
|
||||
|
||||
install( TARGETS cvpcb
|
||||
DESTINATION ${KICAD_BIN}
|
||||
COMPONENT binary
|
||||
)
|
||||
|
||||
endif()
|
||||
|
|
|
@ -311,20 +311,18 @@ if( USE_KIWAY_DLLS )
|
|||
DESTINATION ${KICAD_BIN}
|
||||
COMPONENT binary
|
||||
)
|
||||
if( APPLE )
|
||||
# puts the *.kiface into the *.app bundle while linking
|
||||
set_target_properties( eeschema_kiface PROPERTIES
|
||||
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/eeschema.app/Contents/MacOS/
|
||||
)
|
||||
else()
|
||||
install( TARGETS eeschema_kiface
|
||||
# actual filename subject to change at milestone C)
|
||||
# modular-kicad blueprint.
|
||||
DESTINATION ${KICAD_BIN}
|
||||
COMPONENT binary
|
||||
)
|
||||
|
||||
if( APPLE )
|
||||
# copies kiface into the bundle
|
||||
add_custom_target( _eeschema_kiface_copy ALL
|
||||
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/eeschema/_eeschema.kiface "${CMAKE_BINARY_DIR}/eeschema/eeschema.app/Contents/MacOS/"
|
||||
DEPENDS eeschema_kiface
|
||||
COMMENT "Copying kiface into eeschema"
|
||||
)
|
||||
endif()
|
||||
|
||||
else()
|
||||
|
|
|
@ -5,51 +5,33 @@
|
|||
<key>CFBundleDocumentTypes</key>
|
||||
<array>
|
||||
<dict>
|
||||
<key>CFBundleTypeRole</key>
|
||||
<string>Editor</string>
|
||||
<key>CFBundleTypeRole</key> <string>Editor</string>
|
||||
<key>CFBundleTypeExtensions</key>
|
||||
<array>
|
||||
<string>sch</string>
|
||||
</array>
|
||||
<key>CFBundleTypeIconFile</key>
|
||||
<string>eeschema.icns</string>
|
||||
<key>CFBundleTypeName</key>
|
||||
<string>eeschema document</string>
|
||||
<key>LSHandlerRank</key>
|
||||
<string>Owner</string>
|
||||
|
||||
<key>CFBundleTypeIconFile</key> <string>eeschema.icns</string>
|
||||
<key>CFBundleTypeName</key> <string>eeschema document</string>
|
||||
<key>LSHandlerRank</key> <string>Owner</string>
|
||||
</dict>
|
||||
</array>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>English</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>eeschema</string>
|
||||
<key>CFBundleGetInfoString</key>
|
||||
<string></string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>eeschema.icns</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>org.kicad-eda.eeschema</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleLongVersionString</key>
|
||||
<string></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>
|
||||
|
||||
<key>CFBundleDevelopmentRegion</key> <string>English</string>
|
||||
<key>CFBundleExecutable</key> <string>eeschema</string>
|
||||
<key>CFBundleGetInfoString</key> <string></string>
|
||||
<key>CFBundleIconFile</key> <string>eeschema.icns</string>
|
||||
<key>CFBundleIdentifier</key> <string>org.kicad-eda.eeschema</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key> <string>6.0</string>
|
||||
<key>CFBundleLongVersionString</key> <string></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>
|
||||
</plist>
|
||||
|
|
|
@ -120,7 +120,6 @@ if( USE_KIWAY_DLLS )
|
|||
${GERBVIEW_SRCS}
|
||||
${DIALOGS_SRCS}
|
||||
${GERBVIEW_EXTRA_SRCS}
|
||||
# ${GERBVIEW_RESOURCES}
|
||||
)
|
||||
set_target_properties( gerbview_kiface PROPERTIES
|
||||
OUTPUT_NAME gerbview
|
||||
|
@ -152,18 +151,16 @@ if( USE_KIWAY_DLLS )
|
|||
DESTINATION ${KICAD_BIN}
|
||||
COMPONENT binary
|
||||
)
|
||||
if( APPLE )
|
||||
# puts the *.kiface into the *.app bundle while linking
|
||||
set_target_properties( gerbview_kiface PROPERTIES
|
||||
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/gerbview.app/Contents/MacOS/
|
||||
)
|
||||
else()
|
||||
install( TARGETS gerbview_kiface
|
||||
DESTINATION ${KICAD_BIN}
|
||||
COMPONENT binary
|
||||
)
|
||||
|
||||
if( APPLE )
|
||||
# copies kiface into the bundle
|
||||
add_custom_target( _gerbview_kiface_copy ALL
|
||||
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/gerbview/_gerbview.kiface "${CMAKE_BINARY_DIR}/gerbview/gerbview.app/Contents/MacOS/"
|
||||
DEPENDS gerbview_kiface
|
||||
COMMENT "Copying kiface into gerbview"
|
||||
)
|
||||
endif()
|
||||
|
||||
else()
|
||||
|
@ -194,5 +191,3 @@ if( APPLE )
|
|||
set_target_properties( gerbview PROPERTIES
|
||||
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
|
||||
endif()
|
||||
|
||||
|
||||
|
|
|
@ -27,47 +27,29 @@
|
|||
<string>pho</string>
|
||||
<string>drl</string>
|
||||
</array>
|
||||
<key>CFBundleTypeIconFile</key>
|
||||
<string>gerbview_doc.icns</string>
|
||||
<key>CFBundleTypeName</key>
|
||||
<string>gerbview document</string>
|
||||
<key>LSHandlerRank</key>
|
||||
<string>Default</string>
|
||||
<key>CFBundleTypeRole</key>
|
||||
<string>Viewer</string>
|
||||
|
||||
<key>CFBundleTypeIconFile</key> <string>gerbview_doc.icns</string>
|
||||
<key>CFBundleTypeName</key> <string>gerbview document</string>
|
||||
<key>LSHandlerRank</key> <string>Default</string>
|
||||
<key>CFBundleTypeRole</key> <string>Viewer</string>
|
||||
</dict>
|
||||
</array>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>English</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>gerbview</string>
|
||||
<key>CFBundleGetInfoString</key>
|
||||
<string></string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>gerbview.icns</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>org.kicad-eda.gerbview</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleLongVersionString</key>
|
||||
<string></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>
|
||||
|
||||
<key>CFBundleDevelopmentRegion</key> <string>English</string>
|
||||
<key>CFBundleExecutable</key> <string>gerbview</string>
|
||||
<key>CFBundleGetInfoString</key> <string></string>
|
||||
<key>CFBundleIconFile</key> <string>gerbview.icns</string>
|
||||
<key>CFBundleIdentifier</key> <string>org.kicad-eda.gerbview</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key> <string>6.0</string>
|
||||
<key>CFBundleLongVersionString</key> <string></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>
|
||||
</plist>
|
||||
|
|
|
@ -57,6 +57,22 @@ if( UNIX )
|
|||
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 )
|
||||
set_target_properties( kicad PROPERTIES
|
||||
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
|
||||
|
|
|
@ -5,51 +5,33 @@
|
|||
<key>CFBundleDocumentTypes</key>
|
||||
<array>
|
||||
<dict>
|
||||
<key>CFBundleTypeRole</key>
|
||||
<string>Editor</string>
|
||||
<key>CFBundleTypeIconFile</key>
|
||||
<string>kicad_doc.icns</string>
|
||||
<key>CFBundleTypeExtensions</key>
|
||||
<array>
|
||||
<key>CFBundleTypeRole</key> <string>Editor</string>
|
||||
<key>CFBundleTypeIconFile</key> <string>kicad_doc.icns</string>
|
||||
|
||||
<key>CFBundleTypeExtensions</key> <array>
|
||||
<string>pro</string>
|
||||
</array>
|
||||
<key>CFBundleTypeName</key>
|
||||
<string>kicad project files</string>
|
||||
<key>LSHandlerRank</key>
|
||||
<string>Owner</string>
|
||||
|
||||
<key>CFBundleTypeName</key> <string>kicad project files</string>
|
||||
<key>LSHandlerRank</key> <string>Owner</string>
|
||||
</dict>
|
||||
</array>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>English</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>kicad</string>
|
||||
<key>CFBundleGetInfoString</key>
|
||||
<string></string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>kicad.icns</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>org.kicad-eda.kicad</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleLongVersionString</key>
|
||||
<string></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>
|
||||
|
||||
<key>CFBundleDevelopmentRegion</key> <string>English</string>
|
||||
<key>CFBundleExecutable</key> <string>kicad</string>
|
||||
<key>CFBundleGetInfoString</key> <string></string>
|
||||
<key>CFBundleIconFile</key> <string>kicad.icns</string>
|
||||
<key>CFBundleIdentifier</key> <string>org.kicad-eda.kicad</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key> <string>6.0</string>
|
||||
<key>CFBundleLongVersionString</key> <string></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>
|
||||
</plist>
|
||||
|
|
|
@ -53,6 +53,19 @@ if( MINGW )
|
|||
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()
|
||||
|
||||
|
||||
if( USE_KIWAY_DLLS )
|
||||
|
||||
# a very small program launcher for pl_editor_kiface
|
||||
|
@ -82,7 +95,6 @@ if( USE_KIWAY_DLLS )
|
|||
${PL_EDITOR_SRCS}
|
||||
${DIALOGS_SRCS}
|
||||
${PL_EDITOR_EXTRA_SRCS}
|
||||
# ${PL_EDITOR_RESOURCES}
|
||||
)
|
||||
target_link_libraries( pl_editor_kiface
|
||||
common
|
||||
|
@ -114,18 +126,16 @@ if( USE_KIWAY_DLLS )
|
|||
DESTINATION ${KICAD_BIN}
|
||||
COMPONENT binary
|
||||
)
|
||||
if( APPLE )
|
||||
# puts the *.kiface into the *.app bundle while linking
|
||||
set_target_properties( pl_editor_kiface PROPERTIES
|
||||
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/pl_editor.app/Contents/MacOS/
|
||||
)
|
||||
else()
|
||||
install( TARGETS pl_editor_kiface
|
||||
DESTINATION ${KICAD_BIN}
|
||||
COMPONENT binary
|
||||
)
|
||||
|
||||
if( APPLE )
|
||||
# copies kiface into the bundle
|
||||
add_custom_target( _pleditor_kiface_copy ALL
|
||||
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/pagelayout_editor/_pl_editor.kiface "${CMAKE_BINARY_DIR}/pagelayout_editor/pl_editor.app/Contents/MacOS/"
|
||||
DEPENDS pl_editor_kiface
|
||||
COMMENT "Copying kiface into pleditor"
|
||||
)
|
||||
endif()
|
||||
|
||||
else()
|
||||
|
@ -137,13 +147,6 @@ else()
|
|||
${PL_EDITOR_EXTRA_SRCS}
|
||||
${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
|
||||
common
|
||||
polygon
|
||||
|
@ -152,28 +155,15 @@ else()
|
|||
${wxWidgets_LIBRARIES}
|
||||
${GDI_PLUS_LIBRARIES}
|
||||
)
|
||||
|
||||
install( TARGETS pl_editor
|
||||
DESTINATION ${KICAD_BIN}
|
||||
COMPONENT binary
|
||||
)
|
||||
|
||||
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 )
|
||||
|
||||
set_target_properties( pl_editor PROPERTIES
|
||||
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
|
||||
)
|
||||
endif()
|
||||
|
||||
|
|
|
@ -5,51 +5,33 @@
|
|||
<key>CFBundleDocumentTypes</key>
|
||||
<array>
|
||||
<dict>
|
||||
<key>CFBundleTypeRole</key>
|
||||
<string>Editor</string>
|
||||
<key>CFBundleTypeRole</key> <string>Editor</string>
|
||||
<key>CFBundleTypeExtensions</key>
|
||||
<array>
|
||||
<string>kicad_wks</string>
|
||||
</array>
|
||||
<key>CFBundleTypeIconFile</key>
|
||||
<string>pl_editor.icns</string>
|
||||
<key>CFBundleTypeName</key>
|
||||
<string>pl_editor document</string>
|
||||
<key>LSHandlerRank</key>
|
||||
<string>Owner</string>
|
||||
|
||||
<key>CFBundleTypeIconFile</key> <string>pl_editor.icns</string>
|
||||
<key>CFBundleTypeName</key> <string>pl_editor document</string>
|
||||
<key>LSHandlerRank</key> <string>Owner</string>
|
||||
</dict>
|
||||
</array>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>English</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>pl_editor</string>
|
||||
<key>CFBundleGetInfoString</key>
|
||||
<string></string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>pl_editor.icns</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>org.kicad-eda.pl_editor</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleLongVersionString</key>
|
||||
<string></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>
|
||||
|
||||
<key>CFBundleDevelopmentRegion</key> <string>English</string>
|
||||
<key>CFBundleExecutable</key> <string>pl_editor</string>
|
||||
<key>CFBundleGetInfoString</key> <string></string>
|
||||
<key>CFBundleIconFile</key> <string>pl_editor.icns</string>
|
||||
<key>CFBundleIdentifier</key> <string>org.kicad-eda.pl_editor</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key> <string>6.0</string>
|
||||
<key>CFBundleLongVersionString</key> <string></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>
|
||||
</plist>
|
||||
|
|
|
@ -122,15 +122,16 @@ if( USE_KIWAY_DLLS )
|
|||
DESTINATION ${KICAD_BIN}
|
||||
COMPONENT binary
|
||||
)
|
||||
if( APPLE )
|
||||
# puts the *.kiface into the *.app bundle while linking
|
||||
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
|
||||
)
|
||||
|
||||
if( APPLE )
|
||||
set_target_properties( pcb_calculator PROPERTIES
|
||||
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
|
||||
)
|
||||
endif()
|
||||
|
||||
if( APPLE )
|
||||
|
@ -156,13 +157,6 @@ else()
|
|||
set_source_files_properties( pcb_calculator.cpp PROPERTIES
|
||||
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
|
||||
common
|
||||
bitmaps
|
||||
|
@ -175,3 +169,10 @@ else()
|
|||
)
|
||||
|
||||
endif()
|
||||
|
||||
|
||||
if( APPLE )
|
||||
set_target_properties( pcb_calculator PROPERTIES
|
||||
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
|
||||
)
|
||||
endif()
|
||||
|
|
|
@ -589,18 +589,16 @@ if( USE_KIWAY_DLLS )
|
|||
DESTINATION ${KICAD_BIN}
|
||||
COMPONENT binary
|
||||
)
|
||||
if( APPLE )
|
||||
# puts the *.kiface into the *.app bundle while linking
|
||||
set_target_properties( pcbnew_kiface PROPERTIES
|
||||
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/pcbnew.app/Contents/MacOS/
|
||||
)
|
||||
else()
|
||||
install( TARGETS pcbnew_kiface
|
||||
DESTINATION ${KICAD_BIN}
|
||||
COMPONENT binary
|
||||
)
|
||||
|
||||
if( APPLE )
|
||||
# copies kiface into the bundle
|
||||
add_custom_target( _pcbnew_kiface_copy ALL
|
||||
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/pcbnew/_pcbnew.kiface "${CMAKE_BINARY_DIR}/pcbnew/pcbnew.app/Contents/MacOS/"
|
||||
DEPENDS pcbnew_kiface
|
||||
COMMENT "Copying kiface into pcbnew"
|
||||
)
|
||||
endif()
|
||||
|
||||
else() # milestone A) kills this off:
|
||||
|
@ -763,3 +761,4 @@ if( false ) # haven't been used in years.
|
|||
)
|
||||
target_link_libraries( layer_widget_test common ${wxWidgets_LIBRARIES} )
|
||||
endif()
|
||||
|
||||
|
|
|
@ -5,50 +5,33 @@
|
|||
<key>CFBundleDocumentTypes</key>
|
||||
<array>
|
||||
<dict>
|
||||
<key>CFBundleTypeRole</key>
|
||||
<string>Editor</string>
|
||||
<key>CFBundleTypeIconFile</key>
|
||||
<string>pcbnew_doc.icns</string>
|
||||
<key>CFBundleTypeRole</key> <string>Editor</string>
|
||||
<key>CFBundleTypeIconFile</key> <string>pcbnew_doc.icns</string>
|
||||
<key>CFBundleTypeExtensions</key>
|
||||
<array>
|
||||
<string>kicad_pcb</string>
|
||||
<string>brd</string>
|
||||
</array>
|
||||
<key>CFBundleTypeName</key>
|
||||
<string>pcbnew board</string>
|
||||
<key>LSHandlerRank</key>
|
||||
<string>Owner</string>
|
||||
|
||||
<key>CFBundleTypeName</key> <string>pcbnew board</string>
|
||||
<key>LSHandlerRank</key> <string>Owner</string>
|
||||
</dict>
|
||||
</array>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>pcbnew</string>
|
||||
<key>CFBundleGetInfoString</key>
|
||||
<string></string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>pcbnew.icns</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>org.kicad-eda.pcbnew</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleLongVersionString</key>
|
||||
<string></string>
|
||||
<key>CFBundleName</key>
|
||||
<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>
|
||||
|
||||
<key>CFBundleExecutable</key> <string>pcbnew</string>
|
||||
<key>CFBundleGetInfoString</key> <string></string>
|
||||
<key>CFBundleIconFile</key> <string>pcbnew.icns</string>
|
||||
<key>CFBundleIdentifier</key> <string>org.kicad-eda.pcbnew</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key> <string>6.0</string>
|
||||
<key>CFBundleLongVersionString</key> <string></string>
|
||||
<key>CFBundleName</key> <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>
|
||||
</plist>
|
||||
|
|
Loading…
Reference in New Issue