parent
9dcd7924ab
commit
af1c15646f
|
@ -83,6 +83,14 @@ ELSE(OPENGL_FOUND)
|
|||
MESSAGE(FATAL_ERROR "OpenGL was not found - it is required to build KiCad")
|
||||
ENDIF(OPENGL_FOUND)
|
||||
|
||||
FIND_PACKAGE(Boost)
|
||||
IF(Boost_FOUND)
|
||||
MESSAGE(STATUS "Check for installed Boost -- found")
|
||||
ELSE(Boost_FOUND)
|
||||
MESSAGE(STATUS "Check for installed Boost -- not found")
|
||||
MESSAGE(FATAL_ERROR "Boost was not found - it is required to build KiCad")
|
||||
ENDIF(Boost_FOUND)
|
||||
|
||||
# Here you can define what libraries of wxWidgets you need for your
|
||||
# application. You can figure out what libraries you need here;
|
||||
# http://www.wxwidgets.org/manuals/2.8/wx_librarieslist.html
|
||||
|
|
|
@ -23,6 +23,7 @@ SET(COMMON_SRCS
|
|||
get_component_dialog.cpp
|
||||
gr_basic.cpp
|
||||
hotkeys_basic.cpp
|
||||
infospgm.cpp
|
||||
msgpanel.cpp
|
||||
projet_config.cpp
|
||||
# pyhandler.cpp
|
||||
|
@ -31,7 +32,6 @@ SET(COMMON_SRCS
|
|||
toolbars.cpp
|
||||
trigo.cpp
|
||||
worksheet.cpp
|
||||
wxwineda.cpp
|
||||
infospgm.cpp)
|
||||
wxwineda.cpp)
|
||||
|
||||
ADD_LIBRARY(common ${COMMON_SRCS})
|
||||
|
|
|
@ -1,18 +1,18 @@
|
|||
FIND_PACKAGE(ZLIB)
|
||||
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")
|
||||
IF (NOT MINGW)
|
||||
IF(NOT MINGW)
|
||||
MESSAGE(FATAL_ERROR
|
||||
"zlib was not found - it is required to build KiCad")
|
||||
ELSE (NOT MINGW)
|
||||
ELSE(NOT MINGW)
|
||||
# zlib is not installed, and in this case wxWidgets creates its own zlib library
|
||||
# include files are in ${wxWidgets_ROOT_DIR}/src/zlib
|
||||
#and the corresponding library is libwxzlib-<version>.a ( like libwxzlib-2.8.a)
|
||||
# and the corresponding library is libwxzlib-<version>.a (like libwxzlib-2.8.a)
|
||||
# and we try to use it
|
||||
INCLUDE_DIRECTORIES(${wxWidgets_ROOT_DIR}/src/zlib)
|
||||
ENDIF (NOT MINGW)
|
||||
ENDIF(NOT MINGW)
|
||||
ENDIF(ZLIB_FOUND)
|
||||
|
||||
SET(MINIZIP_SRCS
|
||||
|
@ -20,7 +20,7 @@ SET(MINIZIP_SRCS
|
|||
minizip.c
|
||||
zip.c)
|
||||
|
||||
ADD_EXECUTABLE(minizip ${MINIZIP_SRCS} )
|
||||
ADD_EXECUTABLE(minizip ${MINIZIP_SRCS})
|
||||
|
||||
TARGET_LINK_LIBRARIES(minizip ${ZLIB_LIBRARIES} ${wxWidgets_LIBRARIES})
|
||||
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
ADD_DEFINITIONS(-DPCBNEW)
|
||||
|
||||
FIND_PACKAGE(Boost)
|
||||
|
||||
INCLUDE_DIRECTORIES(
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${Boost_INCLUDE_DIR}
|
||||
|
@ -172,7 +170,7 @@ ADD_EXECUTABLE(dsntest EXCLUDE_FROM_ALL dsn.cpp)
|
|||
TARGET_LINK_LIBRARIES(dsntest common ${wxWidgets_LIBRARIES})
|
||||
|
||||
# This one gets made only when testing.
|
||||
ADD_EXECUTABLE(specctra_test EXCLUDE_FROM_ALL specctra.cpp dsn.cpp )
|
||||
ADD_EXECUTABLE(specctra_test EXCLUDE_FROM_ALL specctra.cpp dsn.cpp)
|
||||
TARGET_LINK_LIBRARIES(specctra_test common ${wxWidgets_LIBRARIES})
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue