Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
efe7edf2
Commit
efe7edf2
authored
Nov 09, 2007
by
f3nix
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CMake:
- Fix minizip build. - Fix eeschema/plugins build. - Update TODO.
parent
f79acc0e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
27 additions
and
21 deletions
+27
-21
CMake.TODO
CMake.TODO
+3
-3
CMakeLists.txt
CMakeLists.txt
+2
-2
CMakeLists.txt
eeschema/CMakeLists.txt
+1
-1
CMakeLists.txt
eeschema/plugins/CMakeLists.txt
+5
-6
CMakeLists.txt
kicad/CMakeLists.txt
+1
-1
CMakeLists.txt
kicad/minizip/CMakeLists.txt
+15
-8
No files found.
CMake.TODO
View file @
efe7edf2
TODO:
* Fix kicad/minizip.
* Fix eeschema/plugins.
* Add install targets for binaries, docs, translations, libraries (Windows, Mac).
Linux version has a preliminary support.
* Add DEBUG target.
* Add DEBUG.
* Add PYTHON.
* Add shared/static.
* Testing under Windows and Mac.
* More testing ...
CMakeLists.txt
View file @
efe7edf2
...
...
@@ -15,7 +15,7 @@ SET(wxWidgets_USE_LIBS base core adv gl html net)
# We need the Find package for wxWidgets to work.
FIND_PACKAGE
(
wxWidgets REQUIRED
)
#Locations for install targets
#
Locations for install targets
IF
(
UNIX
)
#SET(CMAKE_INSTALL_PATH /usr/local)
SET
(
KICAD_BIN bin CACHE PATH
"Location of KiCad binaries."
)
...
...
@@ -31,7 +31,7 @@ ENDIF(UNIX)
IF
(
WIN32
)
ENDIF
(
WIN32
)
#Should this go to IF(UNIX)?
#
Should this go to IF(UNIX)?
IF
(
APPLE
)
ENDIF
(
APPLE
)
...
...
eeschema/CMakeLists.txt
View file @
efe7edf2
...
...
@@ -122,4 +122,4 @@ TARGET_LINK_LIBRARIES(eeschema common ${wxWidgets_LIBRARIES})
INSTALL
(
TARGETS eeschema RUNTIME DESTINATION
${
KICAD_BIN
}
)
#
ADD_SUBDIRECTORY(plugins)
ADD_SUBDIRECTORY
(
plugins
)
eeschema/plugins/CMakeLists.txt
View file @
efe7edf2
INCLUDE
(
CheckFunctionExists
)
CHECK_FUNCTION_EXISTS
(
stricmp HAVE_STRICMP
)
IF
(
UNIX
)
ADD_DEFINITIONS
(
-D__UNIX__
)
ENDIF
(
UNIX
)
IF
(
HAVE_STRICMP
)
ADD_EXECUTABLE
(
netlist_form_pads-pcb netlist_form_pads-pcb.cpp
)
ADD_EXECUTABLE
(
netlist_form_pads-pcb netlist_form_pads-pcb.cpp
)
INSTALL
(
TARGETS netlist_form_pads-pcb RUNTIME DESTINATION
${
KICAD_PLUGINS
}
)
ENDIF
(
HAVE_STRICMP
)
INSTALL
(
TARGETS netlist_form_pads-pcb RUNTIME DESTINATION
${
KICAD_PLUGINS
}
)
kicad/CMakeLists.txt
View file @
efe7edf2
...
...
@@ -29,4 +29,4 @@ TARGET_LINK_LIBRARIES(kicad common ${wxWidgets_LIBRARIES})
INSTALL
(
TARGETS kicad RUNTIME DESTINATION
${
KICAD_BIN
}
)
#
ADD_SUBDIRECTORY(minizip)
ADD_SUBDIRECTORY
(
minizip
)
kicad/minizip/CMakeLists.txt
View file @
efe7edf2
# TODO:
# * Add include for wxzlib
FIND_PACKAGE
(
ZLIB
)
MESSAGE
(
"-- Check for installed ZLIB:"
)
SET
(
MINIZIP_SRCS
ioapi.c
minizip.c
zip.c
)
IF
(
ZLIB_FOUND
)
MESSAGE
(
" ZLIB found"
)
SET
(
MINIZIP_SRCS
ioapi.c
minizip.c
zip.c
)
ADD_EXECUTABLE
(
minizip
${
MINIZIP_SRCS
}
)
ADD_EXECUTABLE
(
minizip
${
MINIZIP_SRCS
}
)
INSTALL
(
TARGETS minizip RUNTIME DESTINATION bin
)
TARGET_LINK_LIBRARIES
(
minizip
${
ZLIB_LIBRARIES
}
)
INSTALL
(
TARGETS minizip RUNTIME DESTINATION bin
)
ELSE
(
ZLIB_FOUND
)
MESSAGE
(
" ZLIB not found"
)
ENDIF
(
ZLIB_FOUND
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment