2014-04-03 11:55:02 +00:00
|
|
|
# the map generation creates on Windows/gcc a lot of useless warnings
|
|
|
|
# so disable it on windows
|
|
|
|
if( WIN32 AND NOT CMAKE_CROSSCOMPILING )
|
|
|
|
set( MAKE_LINK_MAPS false )
|
|
|
|
else()
|
|
|
|
set( MAKE_LINK_MAPS true )
|
|
|
|
endif()
|
* KIWAY Milestone A): Make major modules into DLL/DSOs.
! The initial testing of this commit should be done using a Debug build so that
all the wxASSERT()s are enabled. Also, be sure and keep enabled the
USE_KIWAY_DLLs option. The tree won't likely build without it. Turning it
off is senseless anyways. If you want stable code, go back to a prior version,
the one tagged with "stable".
* Relocate all functionality out of the wxApp derivative into more finely
targeted purposes:
a) DLL/DSO specific
b) PROJECT specific
c) EXE or process specific
d) configuration file specific data
e) configuration file manipulations functions.
All of this functionality was blended into an extremely large wxApp derivative
and that was incompatible with the desire to support multiple concurrently
loaded DLL/DSO's ("KIFACE")s and multiple concurrently open projects.
An amazing amount of organization come from simply sorting each bit of
functionality into the proper box.
* Switch to wxConfigBase from wxConfig everywhere except instantiation.
* Add classes KIWAY, KIFACE, KIFACE_I, SEARCH_STACK, PGM_BASE, PGM_KICAD,
PGM_SINGLE_TOP,
* Remove "Return" prefix on many function names.
* Remove obvious comments from CMakeLists.txt files, and from else() and endif()s.
* Fix building boost for use in a DSO on linux.
* Remove some of the assumptions in the CMakeLists.txt files that windows had
to be the host platform when building windows binaries.
* Reduce the number of wxStrings being constructed at program load time via
static construction.
* Pass wxConfigBase* to all SaveSettings() and LoadSettings() functions so that
these functions are useful even when the wxConfigBase comes from another
source, as is the case in the KICAD_MANAGER_FRAME.
* Move the setting of the KIPRJMOD environment variable into class PROJECT,
so that it can be moved into a project variable soon, and out of FP_LIB_TABLE.
* Add the KIWAY_PLAYER which is associated with a particular PROJECT, and all
its child wxFrames and wxDialogs now have a Kiway() member function which
returns a KIWAY& that that window tree branch is in support of. This is like
wxWindows DNA in that child windows get this member with proper value at time
of construction.
* Anticipate some of the needs for milestones B) and C) and make code
adjustments now in an effort to reduce work in those milestones.
* No testing has been done for python scripting, since milestone C) has that
being largely reworked and re-thought-out.
2014-03-20 00:42:08 +00:00
|
|
|
|
|
|
|
add_definitions( -DCVPCB )
|
2012-01-23 04:33:36 +00:00
|
|
|
|
2014-12-23 13:01:59 +00:00
|
|
|
if( KICAD_USE_WEBKITT AND BUILD_GITHUB_PLUGIN )
|
|
|
|
set( WEBVIEWER_WXLIB "webviewer" )
|
2014-12-21 14:13:14 +00:00
|
|
|
add_definitions( -DKICAD_USE_WEBKIT )
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
2013-08-20 18:03:21 +00:00
|
|
|
include_directories( BEFORE ${INC_BEFORE} )
|
2012-01-23 04:33:36 +00:00
|
|
|
include_directories(
|
|
|
|
./dialogs
|
|
|
|
../3d-viewer
|
|
|
|
../pcbnew
|
2013-09-14 20:33:22 +00:00
|
|
|
../pcbnew/dialogs
|
2012-01-23 04:33:36 +00:00
|
|
|
../polygon
|
|
|
|
../common
|
|
|
|
${INC_AFTER}
|
|
|
|
)
|
2007-11-08 07:17:37 +00:00
|
|
|
|
* KIWAY Milestone A): Make major modules into DLL/DSOs.
! The initial testing of this commit should be done using a Debug build so that
all the wxASSERT()s are enabled. Also, be sure and keep enabled the
USE_KIWAY_DLLs option. The tree won't likely build without it. Turning it
off is senseless anyways. If you want stable code, go back to a prior version,
the one tagged with "stable".
* Relocate all functionality out of the wxApp derivative into more finely
targeted purposes:
a) DLL/DSO specific
b) PROJECT specific
c) EXE or process specific
d) configuration file specific data
e) configuration file manipulations functions.
All of this functionality was blended into an extremely large wxApp derivative
and that was incompatible with the desire to support multiple concurrently
loaded DLL/DSO's ("KIFACE")s and multiple concurrently open projects.
An amazing amount of organization come from simply sorting each bit of
functionality into the proper box.
* Switch to wxConfigBase from wxConfig everywhere except instantiation.
* Add classes KIWAY, KIFACE, KIFACE_I, SEARCH_STACK, PGM_BASE, PGM_KICAD,
PGM_SINGLE_TOP,
* Remove "Return" prefix on many function names.
* Remove obvious comments from CMakeLists.txt files, and from else() and endif()s.
* Fix building boost for use in a DSO on linux.
* Remove some of the assumptions in the CMakeLists.txt files that windows had
to be the host platform when building windows binaries.
* Reduce the number of wxStrings being constructed at program load time via
static construction.
* Pass wxConfigBase* to all SaveSettings() and LoadSettings() functions so that
these functions are useful even when the wxConfigBase comes from another
source, as is the case in the KICAD_MANAGER_FRAME.
* Move the setting of the KIPRJMOD environment variable into class PROJECT,
so that it can be moved into a project variable soon, and out of FP_LIB_TABLE.
* Add the KIWAY_PLAYER which is associated with a particular PROJECT, and all
its child wxFrames and wxDialogs now have a Kiway() member function which
returns a KIWAY& that that window tree branch is in support of. This is like
wxWindows DNA in that child windows get this member with proper value at time
of construction.
* Anticipate some of the needs for milestones B) and C) and make code
adjustments now in an effort to reduce work in those milestones.
* No testing has been done for python scripting, since milestone C) has that
being largely reworked and re-thought-out.
2014-03-20 00:42:08 +00:00
|
|
|
|
2013-08-20 18:03:21 +00:00
|
|
|
set( CVPCB_DIALOGS
|
2014-10-28 15:15:39 +00:00
|
|
|
dialogs/fp_conflict_assignment_selector_base.cpp
|
|
|
|
dialogs/fp_conflict_assignment_selector.cpp
|
2010-10-28 13:02:07 +00:00
|
|
|
dialogs/dialog_display_options.cpp
|
|
|
|
dialogs/dialog_display_options_base.cpp
|
2013-09-14 20:33:22 +00:00
|
|
|
../pcbnew/dialogs/dialog_fp_lib_table.cpp
|
|
|
|
../pcbnew/dialogs/dialog_fp_lib_table_base.cpp
|
2013-10-13 21:33:58 +00:00
|
|
|
../pcbnew/dialogs/dialog_fp_plugin_options.cpp
|
|
|
|
../pcbnew/dialogs/dialog_fp_plugin_options_base.cpp
|
2014-12-21 14:13:14 +00:00
|
|
|
../pcbnew/dialogs/wizard_add_fplib_base.cpp
|
|
|
|
../pcbnew/dialogs/wizard_add_fplib.cpp
|
2010-10-28 13:02:07 +00:00
|
|
|
)
|
|
|
|
|
2013-08-20 18:03:21 +00:00
|
|
|
set( CVPCB_SRCS
|
2012-04-25 19:33:24 +00:00
|
|
|
../common/base_units.cpp
|
2013-05-01 19:01:14 +00:00
|
|
|
../pcbnew/board_items_to_polygon_shape_transform.cpp
|
2012-03-15 14:31:16 +00:00
|
|
|
../pcbnew/class_drc_item.cpp
|
2008-01-30 09:42:19 +00:00
|
|
|
autosel.cpp
|
|
|
|
cfg.cpp
|
2010-05-16 18:18:38 +00:00
|
|
|
class_components_listbox.cpp
|
2010-02-01 21:23:27 +00:00
|
|
|
class_DisplayFootprintsFrame.cpp
|
2010-05-16 18:18:38 +00:00
|
|
|
class_footprints_listbox.cpp
|
2013-05-31 17:33:46 +00:00
|
|
|
class_library_listbox.cpp
|
2008-01-30 09:42:19 +00:00
|
|
|
cvframe.cpp
|
|
|
|
listboxes.cpp
|
2010-12-17 20:34:29 +00:00
|
|
|
menubar.cpp
|
2012-02-11 09:04:26 +00:00
|
|
|
readwrite_dlgs.cpp
|
2008-01-30 09:42:19 +00:00
|
|
|
tool_cvpcb.cpp
|
2011-12-07 05:28:49 +00:00
|
|
|
)
|
2007-11-08 07:17:37 +00:00
|
|
|
|
* KIWAY Milestone A): Make major modules into DLL/DSOs.
! The initial testing of this commit should be done using a Debug build so that
all the wxASSERT()s are enabled. Also, be sure and keep enabled the
USE_KIWAY_DLLs option. The tree won't likely build without it. Turning it
off is senseless anyways. If you want stable code, go back to a prior version,
the one tagged with "stable".
* Relocate all functionality out of the wxApp derivative into more finely
targeted purposes:
a) DLL/DSO specific
b) PROJECT specific
c) EXE or process specific
d) configuration file specific data
e) configuration file manipulations functions.
All of this functionality was blended into an extremely large wxApp derivative
and that was incompatible with the desire to support multiple concurrently
loaded DLL/DSO's ("KIFACE")s and multiple concurrently open projects.
An amazing amount of organization come from simply sorting each bit of
functionality into the proper box.
* Switch to wxConfigBase from wxConfig everywhere except instantiation.
* Add classes KIWAY, KIFACE, KIFACE_I, SEARCH_STACK, PGM_BASE, PGM_KICAD,
PGM_SINGLE_TOP,
* Remove "Return" prefix on many function names.
* Remove obvious comments from CMakeLists.txt files, and from else() and endif()s.
* Fix building boost for use in a DSO on linux.
* Remove some of the assumptions in the CMakeLists.txt files that windows had
to be the host platform when building windows binaries.
* Reduce the number of wxStrings being constructed at program load time via
static construction.
* Pass wxConfigBase* to all SaveSettings() and LoadSettings() functions so that
these functions are useful even when the wxConfigBase comes from another
source, as is the case in the KICAD_MANAGER_FRAME.
* Move the setting of the KIPRJMOD environment variable into class PROJECT,
so that it can be moved into a project variable soon, and out of FP_LIB_TABLE.
* Add the KIWAY_PLAYER which is associated with a particular PROJECT, and all
its child wxFrames and wxDialogs now have a Kiway() member function which
returns a KIWAY& that that window tree branch is in support of. This is like
wxWindows DNA in that child windows get this member with proper value at time
of construction.
* Anticipate some of the needs for milestones B) and C) and make code
adjustments now in an effort to reduce work in those milestones.
* No testing has been done for python scripting, since milestone C) has that
being largely reworked and re-thought-out.
2014-03-20 00:42:08 +00:00
|
|
|
|
|
|
|
if( MINGW )
|
|
|
|
# CVPCB_RESOURCES variable is set by the macro.
|
|
|
|
mingw_resource_compiler( cvpcb )
|
2013-08-20 18:03:21 +00:00
|
|
|
endif()
|
2008-09-07 19:32:07 +00:00
|
|
|
|
* KIWAY Milestone A): Make major modules into DLL/DSOs.
! The initial testing of this commit should be done using a Debug build so that
all the wxASSERT()s are enabled. Also, be sure and keep enabled the
USE_KIWAY_DLLs option. The tree won't likely build without it. Turning it
off is senseless anyways. If you want stable code, go back to a prior version,
the one tagged with "stable".
* Relocate all functionality out of the wxApp derivative into more finely
targeted purposes:
a) DLL/DSO specific
b) PROJECT specific
c) EXE or process specific
d) configuration file specific data
e) configuration file manipulations functions.
All of this functionality was blended into an extremely large wxApp derivative
and that was incompatible with the desire to support multiple concurrently
loaded DLL/DSO's ("KIFACE")s and multiple concurrently open projects.
An amazing amount of organization come from simply sorting each bit of
functionality into the proper box.
* Switch to wxConfigBase from wxConfig everywhere except instantiation.
* Add classes KIWAY, KIFACE, KIFACE_I, SEARCH_STACK, PGM_BASE, PGM_KICAD,
PGM_SINGLE_TOP,
* Remove "Return" prefix on many function names.
* Remove obvious comments from CMakeLists.txt files, and from else() and endif()s.
* Fix building boost for use in a DSO on linux.
* Remove some of the assumptions in the CMakeLists.txt files that windows had
to be the host platform when building windows binaries.
* Reduce the number of wxStrings being constructed at program load time via
static construction.
* Pass wxConfigBase* to all SaveSettings() and LoadSettings() functions so that
these functions are useful even when the wxConfigBase comes from another
source, as is the case in the KICAD_MANAGER_FRAME.
* Move the setting of the KIPRJMOD environment variable into class PROJECT,
so that it can be moved into a project variable soon, and out of FP_LIB_TABLE.
* Add the KIWAY_PLAYER which is associated with a particular PROJECT, and all
its child wxFrames and wxDialogs now have a Kiway() member function which
returns a KIWAY& that that window tree branch is in support of. This is like
wxWindows DNA in that child windows get this member with proper value at time
of construction.
* Anticipate some of the needs for milestones B) and C) and make code
adjustments now in an effort to reduce work in those milestones.
* No testing has been done for python scripting, since milestone C) has that
being largely reworked and re-thought-out.
2014-03-20 00:42:08 +00:00
|
|
|
|
2014-10-17 17:45:33 +00:00
|
|
|
if( APPLE )
|
|
|
|
# setup bundle
|
|
|
|
set( CVPCB_RESOURCES cvpcb.icns cvpcb_doc.icns )
|
|
|
|
set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/cvpcb.icns" PROPERTIES
|
|
|
|
MACOSX_PACKAGE_LOCATION Resources
|
|
|
|
)
|
|
|
|
set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/cvpcb_doc.icns" PROPERTIES
|
|
|
|
MACOSX_PACKAGE_LOCATION Resources
|
|
|
|
)
|
|
|
|
set( MACOSX_BUNDLE_ICON_FILE cvpcb.icns )
|
|
|
|
set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.kicad )
|
|
|
|
set( MACOSX_BUNDLE_NAME cvpcb )
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
2014-10-26 19:54:48 +00:00
|
|
|
add_executable( cvpcb WIN32 MACOSX_BUNDLE
|
|
|
|
../common/single_top.cpp
|
|
|
|
../common/pgm_base.cpp
|
|
|
|
${CVPCB_RESOURCES}
|
|
|
|
)
|
2014-12-21 14:13:14 +00:00
|
|
|
|
2014-10-26 19:54:48 +00:00
|
|
|
set_source_files_properties( ../common/single_top.cpp PROPERTIES
|
|
|
|
COMPILE_DEFINITIONS "TOP_FRAME=FRAME_CVPCB;PGM_DATA_FILE_EXT=\"net\";BUILD_KIWAY_DLL"
|
|
|
|
)
|
2014-12-21 14:13:14 +00:00
|
|
|
|
2014-10-26 19:54:48 +00:00
|
|
|
target_link_libraries( cvpcb
|
|
|
|
#singletop # replaces common, giving us restrictive control and link warnings.
|
|
|
|
# There's way too much crap coming in from common yet.
|
|
|
|
common
|
|
|
|
bitmaps
|
|
|
|
${wxWidgets_LIBRARIES}
|
|
|
|
)
|
|
|
|
|
|
|
|
if( MAKE_LINK_MAPS )
|
|
|
|
set_target_properties( cvpcb PROPERTIES
|
|
|
|
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=cvpcb.map" )
|
|
|
|
endif()
|
|
|
|
|
|
|
|
# the main cvpcb program, in DSO form.
|
|
|
|
add_library( cvpcb_kiface MODULE
|
|
|
|
cvpcb.cpp
|
|
|
|
${CVPCB_SRCS}
|
|
|
|
${CVPCB_DIALOGS}
|
|
|
|
)
|
|
|
|
set_target_properties( cvpcb_kiface PROPERTIES
|
|
|
|
OUTPUT_NAME cvpcb
|
|
|
|
PREFIX ${KIFACE_PREFIX}
|
|
|
|
SUFFIX ${KIFACE_SUFFIX}
|
|
|
|
)
|
|
|
|
target_link_libraries( cvpcb_kiface
|
|
|
|
3d-viewer
|
|
|
|
pcbcommon
|
|
|
|
pcad2kicadpcb
|
|
|
|
common
|
2014-12-23 13:01:59 +00:00
|
|
|
${WEBVIEWER_WXLIB} # before bitmaps, because it uses some bitmaps defined in bitmaps
|
2014-10-26 19:54:48 +00:00
|
|
|
bitmaps
|
|
|
|
polygon
|
|
|
|
gal
|
|
|
|
${wxWidgets_LIBRARIES}
|
|
|
|
${OPENGL_LIBRARIES}
|
|
|
|
${GDI_PLUS_LIBRARIES}
|
|
|
|
${GLEW_LIBRARIES}
|
|
|
|
${CAIRO_LIBRARIES}
|
|
|
|
${PIXMAN_LIBRARY}
|
|
|
|
${OPENMP_LIBRARIES}
|
|
|
|
)
|
|
|
|
|
|
|
|
# Only for win32 cross compilation using MXE
|
|
|
|
if( WIN32 AND MSYS AND CMAKE_CROSSCOMPILING )
|
* KIWAY Milestone A): Make major modules into DLL/DSOs.
! The initial testing of this commit should be done using a Debug build so that
all the wxASSERT()s are enabled. Also, be sure and keep enabled the
USE_KIWAY_DLLs option. The tree won't likely build without it. Turning it
off is senseless anyways. If you want stable code, go back to a prior version,
the one tagged with "stable".
* Relocate all functionality out of the wxApp derivative into more finely
targeted purposes:
a) DLL/DSO specific
b) PROJECT specific
c) EXE or process specific
d) configuration file specific data
e) configuration file manipulations functions.
All of this functionality was blended into an extremely large wxApp derivative
and that was incompatible with the desire to support multiple concurrently
loaded DLL/DSO's ("KIFACE")s and multiple concurrently open projects.
An amazing amount of organization come from simply sorting each bit of
functionality into the proper box.
* Switch to wxConfigBase from wxConfig everywhere except instantiation.
* Add classes KIWAY, KIFACE, KIFACE_I, SEARCH_STACK, PGM_BASE, PGM_KICAD,
PGM_SINGLE_TOP,
* Remove "Return" prefix on many function names.
* Remove obvious comments from CMakeLists.txt files, and from else() and endif()s.
* Fix building boost for use in a DSO on linux.
* Remove some of the assumptions in the CMakeLists.txt files that windows had
to be the host platform when building windows binaries.
* Reduce the number of wxStrings being constructed at program load time via
static construction.
* Pass wxConfigBase* to all SaveSettings() and LoadSettings() functions so that
these functions are useful even when the wxConfigBase comes from another
source, as is the case in the KICAD_MANAGER_FRAME.
* Move the setting of the KIPRJMOD environment variable into class PROJECT,
so that it can be moved into a project variable soon, and out of FP_LIB_TABLE.
* Add the KIWAY_PLAYER which is associated with a particular PROJECT, and all
its child wxFrames and wxDialogs now have a Kiway() member function which
returns a KIWAY& that that window tree branch is in support of. This is like
wxWindows DNA in that child windows get this member with proper value at time
of construction.
* Anticipate some of the needs for milestones B) and C) and make code
adjustments now in an effort to reduce work in those milestones.
* No testing has been done for python scripting, since milestone C) has that
being largely reworked and re-thought-out.
2014-03-20 00:42:08 +00:00
|
|
|
target_link_libraries( cvpcb_kiface
|
2014-10-26 19:54:48 +00:00
|
|
|
opengl32
|
|
|
|
glu32
|
|
|
|
pixman-1
|
|
|
|
fontconfig
|
|
|
|
freetype
|
|
|
|
bz2
|
* KIWAY Milestone A): Make major modules into DLL/DSOs.
! The initial testing of this commit should be done using a Debug build so that
all the wxASSERT()s are enabled. Also, be sure and keep enabled the
USE_KIWAY_DLLs option. The tree won't likely build without it. Turning it
off is senseless anyways. If you want stable code, go back to a prior version,
the one tagged with "stable".
* Relocate all functionality out of the wxApp derivative into more finely
targeted purposes:
a) DLL/DSO specific
b) PROJECT specific
c) EXE or process specific
d) configuration file specific data
e) configuration file manipulations functions.
All of this functionality was blended into an extremely large wxApp derivative
and that was incompatible with the desire to support multiple concurrently
loaded DLL/DSO's ("KIFACE")s and multiple concurrently open projects.
An amazing amount of organization come from simply sorting each bit of
functionality into the proper box.
* Switch to wxConfigBase from wxConfig everywhere except instantiation.
* Add classes KIWAY, KIFACE, KIFACE_I, SEARCH_STACK, PGM_BASE, PGM_KICAD,
PGM_SINGLE_TOP,
* Remove "Return" prefix on many function names.
* Remove obvious comments from CMakeLists.txt files, and from else() and endif()s.
* Fix building boost for use in a DSO on linux.
* Remove some of the assumptions in the CMakeLists.txt files that windows had
to be the host platform when building windows binaries.
* Reduce the number of wxStrings being constructed at program load time via
static construction.
* Pass wxConfigBase* to all SaveSettings() and LoadSettings() functions so that
these functions are useful even when the wxConfigBase comes from another
source, as is the case in the KICAD_MANAGER_FRAME.
* Move the setting of the KIPRJMOD environment variable into class PROJECT,
so that it can be moved into a project variable soon, and out of FP_LIB_TABLE.
* Add the KIWAY_PLAYER which is associated with a particular PROJECT, and all
its child wxFrames and wxDialogs now have a Kiway() member function which
returns a KIWAY& that that window tree branch is in support of. This is like
wxWindows DNA in that child windows get this member with proper value at time
of construction.
* Anticipate some of the needs for milestones B) and C) and make code
adjustments now in an effort to reduce work in those milestones.
* No testing has been done for python scripting, since milestone C) has that
being largely reworked and re-thought-out.
2014-03-20 00:42:08 +00:00
|
|
|
)
|
2014-10-26 19:54:48 +00:00
|
|
|
endif()
|
|
|
|
|
|
|
|
if( BUILD_GITHUB_PLUGIN )
|
|
|
|
target_link_libraries( cvpcb_kiface github_plugin )
|
|
|
|
endif()
|
|
|
|
|
|
|
|
# Must follow github_plugin
|
|
|
|
target_link_libraries( cvpcb_kiface ${Boost_LIBRARIES} )
|
|
|
|
|
|
|
|
if( UNIX AND NOT APPLE )
|
|
|
|
# -lrt must follow Boost
|
|
|
|
target_link_libraries( cvpcb_kiface rt )
|
|
|
|
endif()
|
|
|
|
|
|
|
|
set_source_files_properties( cvpcb.cpp PROPERTIES
|
|
|
|
# The KIFACE is in cvpcb.cpp, export it:
|
|
|
|
COMPILE_DEFINITIONS "BUILD_KIWAY_DLL;COMPILING_DLL"
|
|
|
|
)
|
* KIWAY Milestone A): Make major modules into DLL/DSOs.
! The initial testing of this commit should be done using a Debug build so that
all the wxASSERT()s are enabled. Also, be sure and keep enabled the
USE_KIWAY_DLLs option. The tree won't likely build without it. Turning it
off is senseless anyways. If you want stable code, go back to a prior version,
the one tagged with "stable".
* Relocate all functionality out of the wxApp derivative into more finely
targeted purposes:
a) DLL/DSO specific
b) PROJECT specific
c) EXE or process specific
d) configuration file specific data
e) configuration file manipulations functions.
All of this functionality was blended into an extremely large wxApp derivative
and that was incompatible with the desire to support multiple concurrently
loaded DLL/DSO's ("KIFACE")s and multiple concurrently open projects.
An amazing amount of organization come from simply sorting each bit of
functionality into the proper box.
* Switch to wxConfigBase from wxConfig everywhere except instantiation.
* Add classes KIWAY, KIFACE, KIFACE_I, SEARCH_STACK, PGM_BASE, PGM_KICAD,
PGM_SINGLE_TOP,
* Remove "Return" prefix on many function names.
* Remove obvious comments from CMakeLists.txt files, and from else() and endif()s.
* Fix building boost for use in a DSO on linux.
* Remove some of the assumptions in the CMakeLists.txt files that windows had
to be the host platform when building windows binaries.
* Reduce the number of wxStrings being constructed at program load time via
static construction.
* Pass wxConfigBase* to all SaveSettings() and LoadSettings() functions so that
these functions are useful even when the wxConfigBase comes from another
source, as is the case in the KICAD_MANAGER_FRAME.
* Move the setting of the KIPRJMOD environment variable into class PROJECT,
so that it can be moved into a project variable soon, and out of FP_LIB_TABLE.
* Add the KIWAY_PLAYER which is associated with a particular PROJECT, and all
its child wxFrames and wxDialogs now have a Kiway() member function which
returns a KIWAY& that that window tree branch is in support of. This is like
wxWindows DNA in that child windows get this member with proper value at time
of construction.
* Anticipate some of the needs for milestones B) and C) and make code
adjustments now in an effort to reduce work in those milestones.
* No testing has been done for python scripting, since milestone C) has that
being largely reworked and re-thought-out.
2014-03-20 00:42:08 +00:00
|
|
|
|
2014-10-26 19:54:48 +00:00
|
|
|
if( MAKE_LINK_MAPS )
|
|
|
|
set_target_properties( cvpcb_kiface PROPERTIES
|
|
|
|
LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=_cvpcb.kiface.map" )
|
|
|
|
endif()
|
|
|
|
|
|
|
|
# if building cvpcb, then also build cvpcb_kiface if out of date.
|
|
|
|
add_dependencies( cvpcb cvpcb_kiface )
|
|
|
|
|
|
|
|
# these 2 binaries are a matched set, keep them together:
|
|
|
|
if( APPLE )
|
|
|
|
set_target_properties( cvpcb PROPERTIES
|
|
|
|
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
|
* KIWAY Milestone A): Make major modules into DLL/DSOs.
! The initial testing of this commit should be done using a Debug build so that
all the wxASSERT()s are enabled. Also, be sure and keep enabled the
USE_KIWAY_DLLs option. The tree won't likely build without it. Turning it
off is senseless anyways. If you want stable code, go back to a prior version,
the one tagged with "stable".
* Relocate all functionality out of the wxApp derivative into more finely
targeted purposes:
a) DLL/DSO specific
b) PROJECT specific
c) EXE or process specific
d) configuration file specific data
e) configuration file manipulations functions.
All of this functionality was blended into an extremely large wxApp derivative
and that was incompatible with the desire to support multiple concurrently
loaded DLL/DSO's ("KIFACE")s and multiple concurrently open projects.
An amazing amount of organization come from simply sorting each bit of
functionality into the proper box.
* Switch to wxConfigBase from wxConfig everywhere except instantiation.
* Add classes KIWAY, KIFACE, KIFACE_I, SEARCH_STACK, PGM_BASE, PGM_KICAD,
PGM_SINGLE_TOP,
* Remove "Return" prefix on many function names.
* Remove obvious comments from CMakeLists.txt files, and from else() and endif()s.
* Fix building boost for use in a DSO on linux.
* Remove some of the assumptions in the CMakeLists.txt files that windows had
to be the host platform when building windows binaries.
* Reduce the number of wxStrings being constructed at program load time via
static construction.
* Pass wxConfigBase* to all SaveSettings() and LoadSettings() functions so that
these functions are useful even when the wxConfigBase comes from another
source, as is the case in the KICAD_MANAGER_FRAME.
* Move the setting of the KIPRJMOD environment variable into class PROJECT,
so that it can be moved into a project variable soon, and out of FP_LIB_TABLE.
* Add the KIWAY_PLAYER which is associated with a particular PROJECT, and all
its child wxFrames and wxDialogs now have a Kiway() member function which
returns a KIWAY& that that window tree branch is in support of. This is like
wxWindows DNA in that child windows get this member with proper value at time
of construction.
* Anticipate some of the needs for milestones B) and C) and make code
adjustments now in an effort to reduce work in those milestones.
* No testing has been done for python scripting, since milestone C) has that
being largely reworked and re-thought-out.
2014-03-20 00:42:08 +00:00
|
|
|
)
|
2013-12-09 19:06:47 +00:00
|
|
|
|
2014-10-26 19:54:48 +00:00
|
|
|
# puts binaries into the *.app bundle while linking
|
|
|
|
set_target_properties( cvpcb_kiface PROPERTIES
|
|
|
|
LIBRARY_OUTPUT_DIRECTORY ${OSX_BUNDLE_BUILD_KIFACE_DIR}
|
|
|
|
)
|
|
|
|
# put individual bundle outside of main bundle as a first step
|
|
|
|
# will be pulled into the main bundle when creating main bundle
|
|
|
|
install( TARGETS cvpcb
|
|
|
|
DESTINATION ${KICAD_BIN}
|
|
|
|
COMPONENT binary
|
|
|
|
)
|
|
|
|
install( CODE "
|
2014-10-17 17:45:33 +00:00
|
|
|
# override default embedded path settings
|
|
|
|
${OSX_BUNDLE_OVERRIDE_PATHS}
|
|
|
|
|
|
|
|
# do all the work
|
|
|
|
include( BundleUtilities )
|
|
|
|
fixup_bundle( ${KICAD_BIN}/cvpcb.app/Contents/MacOS/cvpcb
|
|
|
|
\"\"
|
|
|
|
\"\"
|
|
|
|
)
|
|
|
|
" COMPONENT Runtime
|
* KIWAY Milestone A): Make major modules into DLL/DSOs.
! The initial testing of this commit should be done using a Debug build so that
all the wxASSERT()s are enabled. Also, be sure and keep enabled the
USE_KIWAY_DLLs option. The tree won't likely build without it. Turning it
off is senseless anyways. If you want stable code, go back to a prior version,
the one tagged with "stable".
* Relocate all functionality out of the wxApp derivative into more finely
targeted purposes:
a) DLL/DSO specific
b) PROJECT specific
c) EXE or process specific
d) configuration file specific data
e) configuration file manipulations functions.
All of this functionality was blended into an extremely large wxApp derivative
and that was incompatible with the desire to support multiple concurrently
loaded DLL/DSO's ("KIFACE")s and multiple concurrently open projects.
An amazing amount of organization come from simply sorting each bit of
functionality into the proper box.
* Switch to wxConfigBase from wxConfig everywhere except instantiation.
* Add classes KIWAY, KIFACE, KIFACE_I, SEARCH_STACK, PGM_BASE, PGM_KICAD,
PGM_SINGLE_TOP,
* Remove "Return" prefix on many function names.
* Remove obvious comments from CMakeLists.txt files, and from else() and endif()s.
* Fix building boost for use in a DSO on linux.
* Remove some of the assumptions in the CMakeLists.txt files that windows had
to be the host platform when building windows binaries.
* Reduce the number of wxStrings being constructed at program load time via
static construction.
* Pass wxConfigBase* to all SaveSettings() and LoadSettings() functions so that
these functions are useful even when the wxConfigBase comes from another
source, as is the case in the KICAD_MANAGER_FRAME.
* Move the setting of the KIPRJMOD environment variable into class PROJECT,
so that it can be moved into a project variable soon, and out of FP_LIB_TABLE.
* Add the KIWAY_PLAYER which is associated with a particular PROJECT, and all
its child wxFrames and wxDialogs now have a Kiway() member function which
returns a KIWAY& that that window tree branch is in support of. This is like
wxWindows DNA in that child windows get this member with proper value at time
of construction.
* Anticipate some of the needs for milestones B) and C) and make code
adjustments now in an effort to reduce work in those milestones.
* No testing has been done for python scripting, since milestone C) has that
being largely reworked and re-thought-out.
2014-03-20 00:42:08 +00:00
|
|
|
)
|
2014-10-26 19:54:48 +00:00
|
|
|
else()
|
2014-10-17 17:45:33 +00:00
|
|
|
install( TARGETS cvpcb
|
|
|
|
DESTINATION ${KICAD_BIN}
|
|
|
|
COMPONENT binary
|
|
|
|
)
|
2014-10-26 19:54:48 +00:00
|
|
|
install( TARGETS cvpcb_kiface
|
|
|
|
DESTINATION ${KICAD_BIN}
|
|
|
|
COMPONENT binary
|
|
|
|
)
|
* KIWAY Milestone A): Make major modules into DLL/DSOs.
! The initial testing of this commit should be done using a Debug build so that
all the wxASSERT()s are enabled. Also, be sure and keep enabled the
USE_KIWAY_DLLs option. The tree won't likely build without it. Turning it
off is senseless anyways. If you want stable code, go back to a prior version,
the one tagged with "stable".
* Relocate all functionality out of the wxApp derivative into more finely
targeted purposes:
a) DLL/DSO specific
b) PROJECT specific
c) EXE or process specific
d) configuration file specific data
e) configuration file manipulations functions.
All of this functionality was blended into an extremely large wxApp derivative
and that was incompatible with the desire to support multiple concurrently
loaded DLL/DSO's ("KIFACE")s and multiple concurrently open projects.
An amazing amount of organization come from simply sorting each bit of
functionality into the proper box.
* Switch to wxConfigBase from wxConfig everywhere except instantiation.
* Add classes KIWAY, KIFACE, KIFACE_I, SEARCH_STACK, PGM_BASE, PGM_KICAD,
PGM_SINGLE_TOP,
* Remove "Return" prefix on many function names.
* Remove obvious comments from CMakeLists.txt files, and from else() and endif()s.
* Fix building boost for use in a DSO on linux.
* Remove some of the assumptions in the CMakeLists.txt files that windows had
to be the host platform when building windows binaries.
* Reduce the number of wxStrings being constructed at program load time via
static construction.
* Pass wxConfigBase* to all SaveSettings() and LoadSettings() functions so that
these functions are useful even when the wxConfigBase comes from another
source, as is the case in the KICAD_MANAGER_FRAME.
* Move the setting of the KIPRJMOD environment variable into class PROJECT,
so that it can be moved into a project variable soon, and out of FP_LIB_TABLE.
* Add the KIWAY_PLAYER which is associated with a particular PROJECT, and all
its child wxFrames and wxDialogs now have a Kiway() member function which
returns a KIWAY& that that window tree branch is in support of. This is like
wxWindows DNA in that child windows get this member with proper value at time
of construction.
* Anticipate some of the needs for milestones B) and C) and make code
adjustments now in an effort to reduce work in those milestones.
* No testing has been done for python scripting, since milestone C) has that
being largely reworked and re-thought-out.
2014-03-20 00:42:08 +00:00
|
|
|
endif()
|