Small CMake cleanup.
This commit is contained in:
parent
f38bb9d854
commit
61ebbd58f8
|
@ -1,5 +1,5 @@
|
||||||
# Our project is called 'kicad' this is how it will be called in
|
# Our project is called 'kicad'.This is how it will be called in
|
||||||
# visual studio, and in our makefiles.
|
# Visual Studio and in our makefiles.
|
||||||
PROJECT(kicad)
|
PROJECT(kicad)
|
||||||
|
|
||||||
CMAKE_MINIMUM_REQUIRED(VERSION 2.4.6 FATAL_ERROR)
|
CMAKE_MINIMUM_REQUIRED(VERSION 2.4.6 FATAL_ERROR)
|
||||||
|
@ -7,11 +7,11 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4.6 FATAL_ERROR)
|
||||||
# Uncomment this line if you want verbose build messages.
|
# Uncomment this line if you want verbose build messages.
|
||||||
#SET(CMAKE_VERBOSE_MAKEFILE ON)
|
#SET(CMAKE_VERBOSE_MAKEFILE ON)
|
||||||
|
|
||||||
# Set default flags for Debug build
|
# Set default flags for Debug build.
|
||||||
SET(CMAKE_C_FLAGS_DEBUG "-Wall -g3 -ggdb3 -DDEBUG")
|
SET(CMAKE_C_FLAGS_DEBUG "-Wall -g3 -ggdb3 -DDEBUG")
|
||||||
SET(CMAKE_CXX_FLAGS_DEBUG "-Wall -g3 -ggdb3 -DDEBUG")
|
SET(CMAKE_CXX_FLAGS_DEBUG "-Wall -g3 -ggdb3 -DDEBUG")
|
||||||
|
|
||||||
# Set default flags for Release build
|
# Set default flags for Release build.
|
||||||
SET(CMAKE_C_FLAGS_RELEASE "-Wall -O2 -DNDEBUG")
|
SET(CMAKE_C_FLAGS_RELEASE "-Wall -O2 -DNDEBUG")
|
||||||
SET(CMAKE_CXX_FLAGS_RELEASE "-Wall -O2 -DNDEBUG")
|
SET(CMAKE_CXX_FLAGS_RELEASE "-Wall -O2 -DNDEBUG")
|
||||||
SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "-s")
|
SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "-s")
|
||||||
|
@ -24,13 +24,13 @@ SET(wxWidgets_USE_LIBS base core adv gl html net)
|
||||||
# We need the Find package for wxWidgets to work.
|
# We need the Find package for wxWidgets to work.
|
||||||
FIND_PACKAGE(wxWidgets REQUIRED)
|
FIND_PACKAGE(wxWidgets REQUIRED)
|
||||||
|
|
||||||
# Locations for install targets
|
# Locations for install targets.
|
||||||
IF(UNIX)
|
IF(UNIX)
|
||||||
IF(APPLE)
|
IF(APPLE)
|
||||||
ELSE(APPLE)
|
ELSE(APPLE)
|
||||||
# like all variables, CMAKE_INSTALL_PREFIX can be over-ridden on the command line
|
# Like all variables, CMAKE_INSTALL_PREFIX can be over-ridden on the command line.
|
||||||
SET(CMAKE_INSTALL_PREFIX /usr/local)
|
SET(CMAKE_INSTALL_PREFIX /usr/local)
|
||||||
# when used later, "bin" and others with no leading / is relative to CMAKE_INSTALL_PREFIX
|
# When used later, "bin" and others with no leading / is relative to CMAKE_INSTALL_PREFIX.
|
||||||
SET(KICAD_BIN bin CACHE PATH "Location of KiCad binaries.")
|
SET(KICAD_BIN bin CACHE PATH "Location of KiCad binaries.")
|
||||||
SET(KICAD_PLUGINS lib/kicad/plugins CACHE PATH "Location of KiCad plugins.")
|
SET(KICAD_PLUGINS lib/kicad/plugins CACHE PATH "Location of KiCad plugins.")
|
||||||
SET(KICAD_DOCS share/doc/kicad CACHE PATH "Location of KiCad documentation files.")
|
SET(KICAD_DOCS share/doc/kicad CACHE PATH "Location of KiCad documentation files.")
|
||||||
|
@ -43,9 +43,9 @@ IF(UNIX)
|
||||||
ENDIF(UNIX)
|
ENDIF(UNIX)
|
||||||
|
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
# like all variables, CMAKE_INSTALL_PREFIX can be over-ridden on the command line
|
# Like all variables, CMAKE_INSTALL_PREFIX can be over-ridden on the command line.
|
||||||
SET(CMAKE_INSTALL_PREFIX C:/kicad)
|
SET(CMAKE_INSTALL_PREFIX C:/kicad)
|
||||||
# when used later, "winexe" and others with no leading / is relative to CMAKE_INSTALL_PREFIX
|
# When used later, "winexe" and others with no leading / is relative to CMAKE_INSTALL_PREFIX.
|
||||||
SET(KICAD_BIN winexe CACHE PATH "Location of KiCad binaries.")
|
SET(KICAD_BIN winexe CACHE PATH "Location of KiCad binaries.")
|
||||||
SET(KICAD_PLUGINS lib/kicad/plugins CACHE PATH "Location of KiCad plugins.")
|
SET(KICAD_PLUGINS lib/kicad/plugins CACHE PATH "Location of KiCad plugins.")
|
||||||
SET(KICAD_DOCS share/doc/kicad CACHE PATH "Location of KiCad documentation files.")
|
SET(KICAD_DOCS share/doc/kicad CACHE PATH "Location of KiCad documentation files.")
|
||||||
|
@ -71,7 +71,7 @@ IF(wxWidgets_FOUND)
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/include
|
${CMAKE_CURRENT_SOURCE_DIR}/include
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/share)
|
${CMAKE_CURRENT_SOURCE_DIR}/share)
|
||||||
|
|
||||||
# CMake will look in these dirs for nested 'CMakeLists.txt' files
|
# CMake will look in these dirs for nested 'CMakeLists.txt' files.
|
||||||
ADD_SUBDIRECTORY(common)
|
ADD_SUBDIRECTORY(common)
|
||||||
ADD_SUBDIRECTORY(3d-viewer)
|
ADD_SUBDIRECTORY(3d-viewer)
|
||||||
ADD_SUBDIRECTORY(cvpcb)
|
ADD_SUBDIRECTORY(cvpcb)
|
||||||
|
@ -85,10 +85,9 @@ ELSE(wxWidgets_FOUND)
|
||||||
MESSAGE(FATAL_ERROR "wxWidgets was not found - it is required to build KiCad")
|
MESSAGE(FATAL_ERROR "wxWidgets was not found - it is required to build KiCad")
|
||||||
ENDIF(wxWidgets_FOUND)
|
ENDIF(wxWidgets_FOUND)
|
||||||
|
|
||||||
# CMake will look at this dirs for nested 'CMakeLists.txt' files
|
# CMake will look at this dirs for nested 'CMakeLists.txt' files.
|
||||||
ADD_SUBDIRECTORY(internat)
|
ADD_SUBDIRECTORY(internat)
|
||||||
ADD_SUBDIRECTORY(help)
|
ADD_SUBDIRECTORY(help)
|
||||||
ADD_SUBDIRECTORY(library)
|
ADD_SUBDIRECTORY(library)
|
||||||
ADD_SUBDIRECTORY(modules)
|
ADD_SUBDIRECTORY(modules)
|
||||||
ADD_SUBDIRECTORY(template)
|
ADD_SUBDIRECTORY(template)
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,6 @@ SET(EESCHEMA_SRCS
|
||||||
eeload.cpp
|
eeload.cpp
|
||||||
eeredraw.cpp
|
eeredraw.cpp
|
||||||
eeschema.cpp
|
eeschema.cpp
|
||||||
# eestatus.cpp
|
|
||||||
eestring.cpp
|
eestring.cpp
|
||||||
erc.cpp
|
erc.cpp
|
||||||
files-io.cpp
|
files-io.cpp
|
||||||
|
@ -103,10 +102,6 @@ SET(EESCHEMA_EXTRA_SRCS
|
||||||
../share/svg_print.cpp
|
../share/svg_print.cpp
|
||||||
../share/wxprint.cpp
|
../share/wxprint.cpp
|
||||||
../share/zoom.cpp
|
../share/zoom.cpp
|
||||||
|
|
||||||
# ../share/buildmnu.cpp
|
|
||||||
# ../share/mdiframe.cpp
|
|
||||||
# ../share/treeprj.cpp
|
|
||||||
)
|
)
|
||||||
|
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
|
|
|
@ -7,9 +7,9 @@ INCLUDE_DIRECTORIES(
|
||||||
${Boost_INCLUDE_DIRS}
|
${Boost_INCLUDE_DIRS}
|
||||||
bitmaps
|
bitmaps
|
||||||
../3d-viewer
|
../3d-viewer
|
||||||
../polygon
|
../polygon)
|
||||||
)
|
|
||||||
|
|
||||||
|
# Many of the commented out ones are nested in *.cpp files for dialogs
|
||||||
SET(PCBNEW_SRCS
|
SET(PCBNEW_SRCS
|
||||||
affiche.cpp
|
affiche.cpp
|
||||||
attribut.cpp
|
attribut.cpp
|
||||||
|
@ -36,7 +36,6 @@ SET(PCBNEW_SRCS
|
||||||
class_track.cpp
|
class_track.cpp
|
||||||
class_zone.cpp
|
class_zone.cpp
|
||||||
clean.cpp
|
clean.cpp
|
||||||
# many of the commented out ones are nested in *.cpp files for dialogs
|
|
||||||
# cleaningoptions_dialog.cpp
|
# cleaningoptions_dialog.cpp
|
||||||
collectors.cpp
|
collectors.cpp
|
||||||
connect.cpp
|
connect.cpp
|
||||||
|
@ -56,10 +55,12 @@ SET(PCBNEW_SRCS
|
||||||
# dialog_pad_edit.cpp
|
# dialog_pad_edit.cpp
|
||||||
dialog_setup_libs.cpp
|
dialog_setup_libs.cpp
|
||||||
# dialog_track_options.cpp
|
# dialog_track_options.cpp
|
||||||
|
# dialog_zones_by_polygon.cpp
|
||||||
dist.cpp
|
dist.cpp
|
||||||
# docedit.cpp
|
# docedit.cpp <-- not used
|
||||||
dragsegm.cpp
|
dragsegm.cpp
|
||||||
drc.cpp
|
drc.cpp
|
||||||
|
# dsn.cpp
|
||||||
edgemod.cpp
|
edgemod.cpp
|
||||||
edit.cpp
|
edit.cpp
|
||||||
editedge.cpp
|
editedge.cpp
|
||||||
|
@ -67,7 +68,7 @@ SET(PCBNEW_SRCS
|
||||||
editpads.cpp
|
editpads.cpp
|
||||||
editrack.cpp
|
editrack.cpp
|
||||||
editrack-part2.cpp
|
editrack-part2.cpp
|
||||||
# editrout.cpp
|
# editrout.cpp <-- not used
|
||||||
edit_track_width.cpp
|
edit_track_width.cpp
|
||||||
edtxtmod.cpp
|
edtxtmod.cpp
|
||||||
export_gencad.cpp
|
export_gencad.cpp
|
||||||
|
@ -94,7 +95,7 @@ SET(PCBNEW_SRCS
|
||||||
modedit_undo_redo.cpp
|
modedit_undo_redo.cpp
|
||||||
moduleframe.cpp
|
moduleframe.cpp
|
||||||
modules.cpp
|
modules.cpp
|
||||||
# move_copy_track.cpp
|
# move_copy_track.cpp <-- not used
|
||||||
move-drag_pads.cpp
|
move-drag_pads.cpp
|
||||||
move_or_drag_track.cpp
|
move_or_drag_track.cpp
|
||||||
muonde.cpp
|
muonde.cpp
|
||||||
|
@ -135,18 +136,17 @@ SET(PCBNEW_SRCS
|
||||||
work.cpp
|
work.cpp
|
||||||
xchgmod.cpp
|
xchgmod.cpp
|
||||||
# zones.cpp
|
# zones.cpp
|
||||||
zones_by_polygon.cpp
|
zones_by_polygon.cpp)
|
||||||
)
|
|
||||||
|
|
||||||
SET(PCBNEW_EXTRA_SRCS
|
SET(PCBNEW_EXTRA_SRCS
|
||||||
|
# ../polygon/PolyLine.cpp
|
||||||
|
|
||||||
../share/drawframe.cpp
|
../share/drawframe.cpp
|
||||||
../share/drawpanel.cpp
|
../share/drawpanel.cpp
|
||||||
../share/infospgm.cpp
|
../share/infospgm.cpp
|
||||||
../share/setpage.cpp
|
../share/setpage.cpp
|
||||||
../share/wxprint.cpp
|
../share/wxprint.cpp
|
||||||
../share/zoom.cpp
|
../share/zoom.cpp)
|
||||||
# ../polygon/PolyLine.cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
SET(PCBNEW_RESOURCES pcbnew.rc)
|
SET(PCBNEW_RESOURCES pcbnew.rc)
|
||||||
|
@ -157,7 +157,7 @@ ENDIF(APPLE)
|
||||||
|
|
||||||
ADD_EXECUTABLE(pcbnew WIN32 MACOSX_BUNDLE ${PCBNEW_SRCS} ${PCBNEW_EXTRA_SRCS} ${PCBNEW_RESOURCES})
|
ADD_EXECUTABLE(pcbnew WIN32 MACOSX_BUNDLE ${PCBNEW_SRCS} ${PCBNEW_EXTRA_SRCS} ${PCBNEW_RESOURCES})
|
||||||
|
|
||||||
# This one gets made only when testing
|
# This one gets made only when testing.
|
||||||
SET_SOURCE_FILES_PROPERTIES(dsn.cpp PROPERTIES COMPILE_FLAGS -DSTANDALONE)
|
SET_SOURCE_FILES_PROPERTIES(dsn.cpp PROPERTIES COMPILE_FLAGS -DSTANDALONE)
|
||||||
ADD_EXECUTABLE(dsntest EXCLUDE_FROM_ALL dsn.cpp)
|
ADD_EXECUTABLE(dsntest EXCLUDE_FROM_ALL dsn.cpp)
|
||||||
TARGET_LINK_LIBRARIES(dsntest common ${wxWidgets_LIBRARIES})
|
TARGET_LINK_LIBRARIES(dsntest common ${wxWidgets_LIBRARIES})
|
||||||
|
|
Loading…
Reference in New Issue