Commit 32b4d32b authored by raburton's avatar raburton

Make building minizip optional, if your linux distro supplies a minizip binary...

Make building minizip optional, if your linux distro supplies a minizip binary (e.g. in the zlib-bin package on debian) you might as well use it instead of building this one.
Note that this isn't implemented in the minizip CMakeLists.txt, but at the higher level (kicad) that includes the minizip subdirectory, so that the whole minizip directory can be dropped from the shipped source tree if it isn't needed on your distro. This makes the source package a fraction smaller and removes possible complications of having a different license on the minizip code to the rest of kicad.
parent 548fb915
# Our project is called 'kicad'.This is how it will be called in # Our project is called 'kicad'. This is what it will be called in
# Visual Studio and in our makefiles. # Visual Studio and in our makefiles.
PROJECT(kicad) PROJECT(kicad)
...@@ -7,6 +7,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4.6 FATAL_ERROR) ...@@ -7,6 +7,9 @@ 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)
# Comment this out if you don't want to build minizip.
SET(BUILD_MINIZIP ON CACHE BOOL "Build minizip?")
# 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")
......
...@@ -38,4 +38,6 @@ TARGET_LINK_LIBRARIES(kicad common ${wxWidgets_LIBRARIES}) ...@@ -38,4 +38,6 @@ TARGET_LINK_LIBRARIES(kicad common ${wxWidgets_LIBRARIES})
INSTALL(TARGETS kicad RUNTIME DESTINATION ${KICAD_BIN}) INSTALL(TARGETS kicad RUNTIME DESTINATION ${KICAD_BIN})
ADD_SUBDIRECTORY(minizip) IF(BUILD_MINIZIP)
ADD_SUBDIRECTORY(minizip)
ENDIF(BUILD_MINIZIP)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment