Skip to content

K
kicad-source-mirror
Commit 30f6c514 authored by jerryjacobs's avatar jerryjacobs
Browse files
Options

Application title spelling corrected on OSX

parent 445843e3
Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 38 deletions
CMakeLists.txt
View file @ 30f6c514
...@@ -139,7 +139,7 @@ check_find_package_result(OPENGL_FOUND "OpenGL") ...@@ -139,7 +139,7 @@ check_find_package_result(OPENGL_FOUND "OpenGL")
# http://www.wxwidgets.org/manuals/2.8/wx_librarieslist.html # http://www.wxwidgets.org/manuals/2.8/wx_librarieslist.html
if( KICAD_AUIMANAGER OR KICAD_AUITOOLBAR ) if( KICAD_AUIMANAGER OR KICAD_AUITOOLBAR )
find_package(wxWidgets COMPONENTS gl aui adv html core net base QUIET) find_package(wxWidgets COMPONENTS gl adv html core net base QUIET)
# find_package(wxWidgets COMPONENTS gl adv html core net base QUIET) # find_package(wxWidgets COMPONENTS gl adv html core net base QUIET)
else( KICAD_AUIMANAGER OR KICAD_AUITOOLBAR ) else( KICAD_AUIMANAGER OR KICAD_AUITOOLBAR )
find_package(wxWidgets COMPONENTS gl adv html core net base QUIET) find_package(wxWidgets COMPONENTS gl adv html core net base QUIET)
......
cvpcb/CMakeLists.txt
View file @ 30f6c514
...@@ -6,6 +6,15 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ...@@ -6,6 +6,15 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
../pcbnew ../pcbnew
../polygon ../polygon
${CMAKE_SOURCE_DIR}/common) ${CMAKE_SOURCE_DIR}/common)
##
# Name of target on OSX is also the title of the application
# on other targets this should be as normal
##
if(APPLE)
set(CVPCB_NAME CvPCB)
else(APPLE)
set(CVPCB_NAME cvpcb)
endif(APPLE)
set(CVPCB_SRCS set(CVPCB_SRCS
autosel.cpp autosel.cpp
...@@ -41,6 +50,9 @@ if(WIN32) ...@@ -41,6 +50,9 @@ if(WIN32)
endif(MINGW) endif(MINGW)
endif(WIN32) endif(WIN32)
###
# CvPCB.app resources
###
if(APPLE) if(APPLE)
set(CVPCB_RESOURCES cvpcb.icns cvpcb_doc.icns) set(CVPCB_RESOURCES cvpcb.icns cvpcb_doc.icns)
set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/cvpcb.icns" set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/cvpcb.icns"
...@@ -49,17 +61,19 @@ if(APPLE) ...@@ -49,17 +61,19 @@ if(APPLE)
PROPERTIES MACOSX_PACKAGE_LOCATION Resources) PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
set(MACOSX_BUNDLE_ICON_FILE cvpcb.icns) set(MACOSX_BUNDLE_ICON_FILE cvpcb.icns)
set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.cvpcb) set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.cvpcb)
set(MACOSX_BUNDLE_NAME cvpcb)
endif(APPLE) endif(APPLE)
add_executable(cvpcb WIN32 MACOSX_BUNDLE ${CVPCB_SRCS} ${CVPCB_RESOURCES}) add_executable(${CVPCB_NAME} WIN32 MACOSX_BUNDLE ${CVPCB_SRCS} ${CVPCB_RESOURCES})
###
# CvPCB.app creation
###
if(APPLE) if(APPLE)
set_target_properties(cvpcb PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist) set_target_properties(${CVPCB_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
endif(APPLE) endif(APPLE)
target_link_libraries(cvpcb 3d-viewer common pcbcommon polygon bitmaps kbool ${OPENGL_LIBRARIES} ${wxWidgets_LIBRARIES}) target_link_libraries(${CVPCB_NAME} 3d-viewer common pcbcommon polygon bitmaps kbool ${OPENGL_LIBRARIES} ${wxWidgets_LIBRARIES})
install(TARGETS cvpcb install(TARGETS ${CVPCB_NAME}
DESTINATION ${KICAD_BIN} DESTINATION ${KICAD_BIN}
COMPONENT binary) COMPONENT binary)
cvpcb/Info.plist
View file @ 30f6c514
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>English</string> <string>English</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>cvpcb</string> <string>CvPCB</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string></string> <string></string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<key>CFBundleLongVersionString</key> <key>CFBundleLongVersionString</key>
<string></string> <string></string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string></string> <string>CvPCB</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
......
cvpcb/cvpcb.cpp
View file @ 30f6c514
...@@ -79,7 +79,7 @@ bool WinEDA_App::OnInit() ...@@ -79,7 +79,7 @@ bool WinEDA_App::OnInit()
wxString msg; wxString msg;
WinEDA_CvpcbFrame* frame = NULL; WinEDA_CvpcbFrame* frame = NULL;
InitEDA_Appl( wxT( "Cvpcb" ), APP_TYPE_CVPCB ); InitEDA_Appl( wxT( "CvPCB" ), APP_TYPE_CVPCB );
if( m_Checker && m_Checker->IsAnotherRunning() ) if( m_Checker && m_Checker->IsAnotherRunning() )
{ {
......
eeschema/CMakeLists.txt
View file @ 30f6c514
...@@ -4,6 +4,15 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ...@@ -4,6 +4,15 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/common ${CMAKE_SOURCE_DIR}/common
${Boost_INCLUDE_DIR} ${Boost_INCLUDE_DIR}
) )
##
# Name of target on OSX is also the title of the application
# on other targets this should be as normal
##
if(APPLE)
set(EESCHEMA_NAME EESchema)
else(APPLE)
set(EESCHEMA_NAME eeschema)
endif(APPLE)
set(EESCHEMA_SRCS set(EESCHEMA_SRCS
annotate.cpp annotate.cpp
...@@ -146,18 +155,17 @@ if(APPLE) ...@@ -146,18 +155,17 @@ if(APPLE)
PROPERTIES MACOSX_PACKAGE_LOCATION Resources) 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_NAME eeschema)
endif(APPLE) endif(APPLE)
add_executable(eeschema WIN32 MACOSX_BUNDLE ${EESCHEMA_SRCS} ${EESCHEMA_EXTRA_SRCS} ${EESCHEMA_RESOURCES}) add_executable(${EESCHEMA_NAME} WIN32 MACOSX_BUNDLE ${EESCHEMA_SRCS} ${EESCHEMA_EXTRA_SRCS} ${EESCHEMA_RESOURCES})
if(APPLE) if(APPLE)
set_target_properties(eeschema PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist) set_target_properties(${EESCHEMA_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
endif(APPLE) endif(APPLE)
target_link_libraries(eeschema common bitmaps ${wxWidgets_LIBRARIES}) target_link_libraries(${EESCHEMA_NAME} common bitmaps ${wxWidgets_LIBRARIES})
install(TARGETS eeschema install(TARGETS ${EESCHEMA_NAME}
DESTINATION ${KICAD_BIN} DESTINATION ${KICAD_BIN}
COMPONENT binary) COMPONENT binary)
......
eeschema/Info.plist
View file @ 30f6c514
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>English</string> <string>English</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>eeschema</string> <string>EESchema</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string></string> <string></string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<key>CFBundleLongVersionString</key> <key>CFBundleLongVersionString</key>
<string></string> <string></string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string></string> <string>EESchema</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
......
eeschema/eeschema.cpp
View file @ 30f6c514
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "gestfich.h" #include "gestfich.h"
#include "bitmaps.h" #include "bitmaps.h"
#include "eda_dde.h" #include "eda_dde.h"
#include "id.h"
#include "program.h" #include "program.h"
#include "general.h" #include "general.h"
...@@ -110,6 +111,14 @@ void WinEDA_App::MacOpenFile(const wxString &fileName) { ...@@ -110,6 +111,14 @@ void WinEDA_App::MacOpenFile(const wxString &fileName) {
bool WinEDA_App::OnInit() bool WinEDA_App::OnInit()
{ {
#ifdef __WXMAC__
wxApp::SetExitOnFrameDelete(false);
wxApp::s_macAboutMenuItemId = ID_KICAD_ABOUT;
wxApp::s_macPreferencesMenuItemId = ID_CONFIG_REQ;
#endif /* __WXMAC__ */
wxFileName fn; wxFileName fn;
WinEDA_SchematicFrame* frame = NULL; WinEDA_SchematicFrame* frame = NULL;
......
gerbview/CMakeLists.txt
View file @ 30f6c514
...@@ -6,6 +6,15 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ...@@ -6,6 +6,15 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
../cvpcb ../cvpcb
../pcbnew ../pcbnew
../polygon) ../polygon)
##
# Name of target on OSX is also the title of the application
# on other targets this should be as normal
##
if(APPLE)
set(GERBVIEW_NAME GerbView)
else(APPLE)
set(GERBVIEW_NAME gerbview)
endif(APPLE)
set(GERBVIEW_SRCS set(GERBVIEW_SRCS
block.cpp block.cpp
...@@ -61,17 +70,16 @@ if(APPLE) ...@@ -61,17 +70,16 @@ if(APPLE)
PROPERTIES MACOSX_PACKAGE_LOCATION Resources) PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
set(MACOSX_BUNDLE_ICON_FILE gerbview.icns) set(MACOSX_BUNDLE_ICON_FILE gerbview.icns)
set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.gerbview) set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.gerbview)
set(MACOSX_BUNDLE_NAME gerbview)
endif(APPLE) endif(APPLE)
add_executable(gerbview WIN32 MACOSX_BUNDLE ${GERBVIEW_SRCS} ${GERBVIEW_EXTRA_SRCS} ${GERBVIEW_RESOURCES}) add_executable(${GERBVIEW_NAME} WIN32 MACOSX_BUNDLE ${GERBVIEW_SRCS} ${GERBVIEW_EXTRA_SRCS} ${GERBVIEW_RESOURCES})
if(APPLE) if(APPLE)
set_target_properties(gerbview PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist) set_target_properties(${GERBVIEW_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
endif(APPLE) endif(APPLE)
target_link_libraries(gerbview common pcbcommon 3d-viewer polygon bitmaps kbool ${OPENGL_LIBRARIES} ${wxWidgets_LIBRARIES}) target_link_libraries(${GERBVIEW_NAME} common pcbcommon 3d-viewer polygon bitmaps kbool ${OPENGL_LIBRARIES} ${wxWidgets_LIBRARIES})
install(TARGETS gerbview install(TARGETS ${GERBVIEW_NAME}
DESTINATION ${KICAD_BIN} DESTINATION ${KICAD_BIN}
COMPONENT binary) COMPONENT binary)
gerbview/Info.plist
View file @ 30f6c514
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>English</string> <string>English</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>gerbview</string> <string>GerbView</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string></string> <string></string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<key>CFBundleLongVersionString</key> <key>CFBundleLongVersionString</key>
<string></string> <string></string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string></string> <string>GerbView</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
......
kicad/CMakeLists.txt
View file @ 30f6c514
...@@ -36,17 +36,24 @@ if(APPLE) ...@@ -36,17 +36,24 @@ if(APPLE)
set(MACOSX_BUNDLE_NAME kicad) set(MACOSX_BUNDLE_NAME kicad)
endif(APPLE) endif(APPLE)
add_executable(kicad WIN32 MACOSX_BUNDLE ${KICAD_SRCS} ${KICAD_EXTRA_SRCS} ${KICAD_RESOURCES})
if(APPLE) if(APPLE)
set_target_properties(kicad PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist) add_executable(KiCad MACOSX_BUNDLE ${KICAD_SRCS} ${KICAD_EXTRA_SRCS} ${KICAD_RESOURCES})
else(APPLE)
add_executable(kicad WIN32 ${KICAD_SRCS} ${KICAD_EXTRA_SRCS} ${KICAD_RESOURCES})
endif(APPLE) endif(APPLE)
target_link_libraries(kicad common bitmaps ${wxWidgets_LIBRARIES}) if(APPLE)
set_target_properties(KiCad PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
install(TARGETS kicad target_link_libraries(KiCad common bitmaps ${wxWidgets_LIBRARIES})
install(TARGETS KiCad
DESTINATION ${KICAD_BIN} DESTINATION ${KICAD_BIN}
COMPONENT binary) COMPONENT binary)
else(APPLE)
target_link_libraries(kicad common bitmaps ${wxWidgets_LIBRARIES})
install(TARGETS kicad
DESTINATION ${KICAD_BIN}
COMPONENT binary)
endif(APPLE)
if(KICAD_MINIZIP) if(KICAD_MINIZIP)
add_subdirectory(minizip) add_subdirectory(minizip)
......
kicad/Info.plist
View file @ 30f6c514
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>English</string> <string>English</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>kicad</string> <string>KiCad</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string></string> <string></string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<key>CFBundleLongVersionString</key> <key>CFBundleLongVersionString</key>
<string></string> <string></string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string></string> <string>KiCad</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
......
pcbnew/CMakeLists.txt
View file @ 30f6c514
...@@ -4,6 +4,15 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ...@@ -4,6 +4,15 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${Boost_INCLUDE_DIR} ${Boost_INCLUDE_DIR}
../3d-viewer ../3d-viewer
../polygon) ../polygon)
##
# Name of target on OSX is also the title of the application
# on other targets this should be as normal
##
if(APPLE)
set(PCBNEW_NAME PCBNew)
else(APPLE)
set(PCBNEW_NAME pcbnew)
endif(APPLE)
# Many of the commented out ones are nested in *.cpp files for dialogs # Many of the commented out ones are nested in *.cpp files for dialogs
set(PCBNEW_SRCS set(PCBNEW_SRCS
...@@ -182,7 +191,6 @@ if(APPLE) ...@@ -182,7 +191,6 @@ if(APPLE)
PROPERTIES MACOSX_PACKAGE_LOCATION Resources) PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
set(MACOSX_BUNDLE_ICON_FILE pcbnew.icns) set(MACOSX_BUNDLE_ICON_FILE pcbnew.icns)
set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.pcbnew) set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.pcbnew)
set(MACOSX_BUNDLE_NAME pcbnew)
set(MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist) set(MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
endif(APPLE) endif(APPLE)
...@@ -203,18 +211,18 @@ set_source_files_properties( dialog_freeroute_exchange.cpp ...@@ -203,18 +211,18 @@ set_source_files_properties( dialog_freeroute_exchange.cpp
OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialog_freeroute_exchange_help_html.h OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialog_freeroute_exchange_help_html.h
) )
add_executable(pcbnew WIN32 MACOSX_BUNDLE ${PCBNEW_SRCS} add_executable(${PCBNEW_NAME} WIN32 MACOSX_BUNDLE ${PCBNEW_SRCS}
${PCBNEW_EXTRA_SRCS} ${PCBNEW_EXTRA_SRCS}
${PCBNEW_RESOURCES} ${PCBNEW_RESOURCES}
) )
if(APPLE) if(APPLE)
set_target_properties(pcbnew PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist) set_target_properties(${PCBNEW_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
endif(APPLE) endif(APPLE)
target_link_libraries(pcbnew 3d-viewer common pcbcommon polygon bitmaps kbool ${OPENGL_LIBRARIES} ${wxWidgets_LIBRARIES}) target_link_libraries(${PCBNEW_NAME} 3d-viewer common pcbcommon polygon bitmaps kbool ${OPENGL_LIBRARIES} ${wxWidgets_LIBRARIES})
install(TARGETS pcbnew install(TARGETS ${PCBNEW_NAME}
DESTINATION ${KICAD_BIN} DESTINATION ${KICAD_BIN}
COMPONENT binary) COMPONENT binary)
......
pcbnew/Info.plist
View file @ 30f6c514
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</dict> </dict>
</array> </array>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>pcbnew</string> <string>PCBNew</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string></string> <string></string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<key>CFBundleLongVersionString</key> <key>CFBundleLongVersionString</key>
<string></string> <string></string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string>pcbnew</string> <string>PCBNew</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
......
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