Try some new Mac support ideas. (ecbe6e08) · Commits · Elphel / kicad-source-mirror

cvpcb/CMakeLists.txt

+15 −24

Original line number	Original line	Diff line number	Diff line
	@@ -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 )
	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 )
	DESTINATION ${KICAD_BIN}		DESTINATION ${KICAD_BIN}
	COMPONENT binary		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		install( TARGETS cvpcb_kiface
	DESTINATION ${KICAD_BIN}		DESTINATION ${KICAD_BIN}
	COMPONENT binary		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()		endif()

	else()		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

+11 −13

Original line number	Original line	Diff line number	Diff line
	@@ -311,20 +311,18 @@ if( USE_KIWAY_DLLS )
	DESTINATION ${KICAD_BIN}		DESTINATION ${KICAD_BIN}
	COMPONENT binary		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		install( TARGETS eeschema_kiface
	# actual filename subject to change at milestone C)		# actual filename subject to change at milestone C)
	# modular-kicad blueprint.		# modular-kicad blueprint.
	DESTINATION ${KICAD_BIN}		DESTINATION ${KICAD_BIN}
	COMPONENT binary		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()		endif()

	else()		else()

eeschema/Info.plist

+31 −49

Original line number	Original line	Diff line number	Diff line
	@@ -5,51 +5,33 @@
	<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>
	<string>eeschema.icns</string>		<key>CFBundleTypeIconFile</key> <string>eeschema.icns</string>
	<key>CFBundleTypeName</key>		<key>CFBundleTypeName</key> <string>eeschema document</string>
	<string>eeschema document</string>		<key>LSHandlerRank</key> <string>Owner</string>
	<key>LSHandlerRank</key>
	<string>Owner</string>
	</dict>		</dict>
	</array>		</array>
	<key>CFBundleDevelopmentRegion</key>
	<string>English</string>		<key>CFBundleDevelopmentRegion</key> <string>English</string>
	<key>CFBundleExecutable</key>		<key>CFBundleExecutable</key> <string>eeschema</string>
	<string>eeschema</string>		<key>CFBundleGetInfoString</key> <string></string>
	<key>CFBundleGetInfoString</key>		<key>CFBundleIconFile</key> <string>eeschema.icns</string>
	<string></string>		<key>CFBundleIdentifier</key> <string>org.kicad-eda.eeschema</string>
	<key>CFBundleIconFile</key>		<key>CFBundleInfoDictionaryVersion</key> <string>6.0</string>
	<string>eeschema.icns</string>		<key>CFBundleLongVersionString</key> <string></string>
	<key>CFBundleIdentifier</key>		<key>CFBundleName</key> <string>EESchema</string>
	<string>org.kicad-eda.eeschema</string>		<key>CFBundlePackageType</key> <string>APPL</string>
	<key>CFBundleInfoDictionaryVersion</key>		<key>CFBundleShortVersionString</key> <string></string>
	<string>6.0</string>		<key>CFBundleSignature</key> <string>????</string>
	<key>CFBundleLongVersionString</key>		<key>CFBundleVersion</key> <string></string>
	<string></string>		<key>CSResourcesFileMapped</key> <true/>
	<key>CFBundleName</key>		<key>LSRequiresCarbon</key> <true/>
	<string>EESchema</string>		<key>NSHumanReadableCopyright</key> <string></string>
	<key>CFBundlePackageType</key>		<key>NSHighResolutionCapable</key> <string>True</string>
	<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

+12 −17

Original line number	Original line	Diff line number	Diff line
	@@ -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 )
	DESTINATION ${KICAD_BIN}		DESTINATION ${KICAD_BIN}
	COMPONENT binary		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		install( TARGETS gerbview_kiface
	DESTINATION ${KICAD_BIN}		DESTINATION ${KICAD_BIN}
	COMPONENT binary		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()		endif()

	else()		else()
	@@ -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

+49 −67

Original line number	Original line	Diff line number	Diff line
	@@ -27,47 +27,29 @@
	<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>
	<key>CFBundleTypeRole</key>
	<string>Viewer</string>
	</dict>		</dict>
	</array>		</array>
	<key>CFBundleDevelopmentRegion</key>
	<string>English</string>		<key>CFBundleDevelopmentRegion</key> <string>English</string>
	<key>CFBundleExecutable</key>		<key>CFBundleExecutable</key> <string>gerbview</string>
	<string>gerbview</string>		<key>CFBundleGetInfoString</key> <string></string>
	<key>CFBundleGetInfoString</key>		<key>CFBundleIconFile</key> <string>gerbview.icns</string>
	<string></string>		<key>CFBundleIdentifier</key> <string>org.kicad-eda.gerbview</string>
	<key>CFBundleIconFile</key>		<key>CFBundleInfoDictionaryVersion</key> <string>6.0</string>
	<string>gerbview.icns</string>		<key>CFBundleLongVersionString</key> <string></string>
	<key>CFBundleIdentifier</key>		<key>CFBundleName</key> <string>GerbView</string>
	<string>org.kicad-eda.gerbview</string>		<key>CFBundlePackageType</key> <string>APPL</string>
	<key>CFBundleInfoDictionaryVersion</key>		<key>CFBundleShortVersionString</key> <string></string>
	<string>6.0</string>		<key>CFBundleSignature</key> <string>????</string>
	<key>CFBundleLongVersionString</key>		<key>CFBundleVersion</key> <string></string>
	<string></string>		<key>CSResourcesFileMapped</key> <true/>
	<key>CFBundleName</key>		<key>LSRequiresCarbon</key> <true/>
	<string>GerbView</string>		<key>NSHumanReadableCopyright</key> <string></string>
	<key>CFBundlePackageType</key>		<key>NSHighResolutionCapable</key> <string>True</string>
	<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>

Admin message