Commit 95565cda authored by f3nix's avatar f3nix
Browse files

Some small CMake fixes.

parent 97be0050

3d-viewer/CMakeLists.txt

+0 −1
Original line number Original line Diff line number Diff line 


FIND_PACKAGE(OpenGL REQUIRED)

FIND_PACKAGE(OpenGL REQUIRED)

IF(OPENGL_FOUND)

IF(OPENGL_FOUND)

	MESSAGE(STATUS "Check for installed OpenGL -- found")

	MESSAGE(STATUS "Check for installed OpenGL -- found")

CMakeLists.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,8 @@ SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "-s") 
# http://www.wxwidgets.org/manuals/2.8/wx_librarieslist.html

# http://www.wxwidgets.org/manuals/2.8/wx_librarieslist.html

SET(wxWidgets_USE_LIBS base core adv gl html net)

SET(wxWidgets_USE_LIBS base core adv gl html net)





# OpenGL support

SET(WXWINDOWS_USE_GL 1)

# 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)

kicad/minizip/CMakeLists.txt

+12 −12
Original line number Original line Diff line number Diff line 
FIND_PACKAGE(ZLIB)

FIND_PACKAGE(ZLIB REQUIRED)



IF(ZLIB_FOUND)

IF(ZLIB_FOUND)

	MESSAGE(STATUS "Check for installed ZLIB -- found")

	MESSAGE(STATUS "Check for installed ZLIB -- found")

ELSE(ZLIB_FOUND)

	MESSAGE(STATUS "Check for installed zlib -- not found")

	MESSAGE(FATAL_ERROR "zlib was not found - it is required to build KiCad")

ENDIF(ZLIB_FOUND)



SET(MINIZIP_SRCS

SET(MINIZIP_SRCS

	ioapi.c

	ioapi.c

	minizip.c

	minizip.c
@@ -12,7 +16,3 @@ IF(ZLIB_FOUND) 
TARGET_LINK_LIBRARIES(minizip ${ZLIB_LIBRARIES})

TARGET_LINK_LIBRARIES(minizip ${ZLIB_LIBRARIES})





INSTALL(TARGETS minizip RUNTIME DESTINATION bin)
 
INSTALL(TARGETS minizip RUNTIME DESTINATION bin)
 
ELSE(ZLIB_FOUND)

	MESSAGE(STATUS "Check for installed zlib -- not found")

	MESSAGE(FATAL_ERROR "zlib was not found - it is required to build KiCad")

ENDIF(ZLIB_FOUND)

pcbnew/CMakeLists.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -133,10 +133,10 @@ SET(PCBNEW_SRCS 
	via_edit.cpp

	via_edit.cpp

	work.cpp

	work.cpp

	xchgmod.cpp

	xchgmod.cpp

	zones_by_polygon.cpp

	zone_filling_algorithm.cpp

	zone_filling_algorithm.cpp

	zones_by_polygon.cpp

#	zones.cpp

#	zones.cpp

	)

	zones_test_and_combine_areas.cpp)





SET(PCBNEW_EXTRA_SRCS

SET(PCBNEW_EXTRA_SRCS

	../share/drawframe.cpp

	../share/drawframe.cpp