Commit efe7edf2 authored by f3nix's avatar f3nix
Browse files

CMake: 

- Fix minizip build.
- Fix eeschema/plugins build.
- Update TODO.
parent f79acc0e

CMake.TODO

+3 −3
Original line number Diff line number Diff line 
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 ...

eeschema/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

+5 −6
Original line number Diff line number Diff line 
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)



INSTALL(TARGETS netlist_form_pads-pcb RUNTIME DESTINATION ${KICAD_PLUGINS})
 
ENDIF(HAVE_STRICMP)

kicad/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

+15 −8
Original line number Diff line number Diff line 
# TODO:

# * Add include for wxzlib

FIND_PACKAGE(ZLIB)

MESSAGE("-- Check for installed ZLIB:")



IF(ZLIB_FOUND)

	MESSAGE("      ZLIB found")

	SET(MINIZIP_SRCS

		ioapi.c

		minizip.c
@@ -8,4 +10,9 @@ SET(MINIZIP_SRCS 


	ADD_EXECUTABLE(minizip ${MINIZIP_SRCS} )



	TARGET_LINK_LIBRARIES(minizip ${ZLIB_LIBRARIES})



	INSTALL(TARGETS minizip RUNTIME DESTINATION bin)

ELSE(ZLIB_FOUND)

	MESSAGE("      ZLIB not found")

ENDIF(ZLIB_FOUND)

CMakeLists.txt

+2 −2

File changed.

Contains only whitespace changes.