haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: 

- Fix minizip build.
- Fix eeschema/plugins build.
- Update TODO.
This commit is contained in:
f3nix 2007-11-09 21:45:26 +00:00
parent f79acc0ef7
commit efe7edf2f1
6 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMake.TODO
View File

@ -1,8 +1,8 @@
TODO: TODO:
* Fix kicad/minizip.
* Fix eeschema/plugins.
* Add install targets for binaries, docs, translations, libraries (Windows, Mac). * Add install targets for binaries, docs, translations, libraries (Windows, Mac).
Linux version has a preliminary support. Linux version has a preliminary support.
* Add DEBUG target. * Add DEBUG.
* Add PYTHON.
* Add shared/static.
* Testing under Windows and Mac. * Testing under Windows and Mac.
* More testing ... * More testing ...

4
CMakeLists.txt
View File

@ -15,7 +15,7 @@ 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)
#SET(CMAKE_INSTALL_PATH /usr/local) #SET(CMAKE_INSTALL_PATH /usr/local)
SET(KICAD_BIN bin CACHE PATH "Location of KiCad binaries.") SET(KICAD_BIN bin CACHE PATH "Location of KiCad binaries.")
@ -31,7 +31,7 @@ ENDIF(UNIX)
IF(WIN32) IF(WIN32)
ENDIF(WIN32) ENDIF(WIN32)
#Should this go to IF(UNIX)? # Should this go to IF(UNIX)?
IF(APPLE) IF(APPLE)
ENDIF(APPLE) ENDIF(APPLE)

2
eeschema/CMakeLists.txt
View File

@ -122,4 +122,4 @@ TARGET_LINK_LIBRARIES(eeschema common ${wxWidgets_LIBRARIES})
INSTALL(TARGETS eeschema RUNTIME DESTINATION ${KICAD_BIN}) INSTALL(TARGETS eeschema RUNTIME DESTINATION ${KICAD_BIN})
#ADD_SUBDIRECTORY(plugins) ADD_SUBDIRECTORY(plugins)

11
eeschema/plugins/CMakeLists.txt
View File

@ -1,8 +1,7 @@
INCLUDE(CheckFunctionExists) IF(UNIX)
CHECK_FUNCTION_EXISTS(stricmp HAVE_STRICMP) 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}) INSTALL(TARGETS netlist_form_pads-pcb RUNTIME DESTINATION ${KICAD_PLUGINS})
ENDIF(HAVE_STRICMP)

2
kicad/CMakeLists.txt
View File

@ -29,4 +29,4 @@ TARGET_LINK_LIBRARIES(kicad common ${wxWidgets_LIBRARIES})
INSTALL(TARGETS kicad RUNTIME DESTINATION ${KICAD_BIN}) INSTALL(TARGETS kicad RUNTIME DESTINATION ${KICAD_BIN})
#ADD_SUBDIRECTORY(minizip) ADD_SUBDIRECTORY(minizip)

23
kicad/minizip/CMakeLists.txt
View File

@ -1,11 +1,18 @@
# TODO: FIND_PACKAGE(ZLIB)
# * Add include for wxzlib MESSAGE("-- Check for installed ZLIB:")
SET(MINIZIP_SRCS IF(ZLIB_FOUND)
ioapi.c MESSAGE(" ZLIB found")
minizip.c SET(MINIZIP_SRCS
zip.c) 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)