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

added boost checking

This commit is contained in:
dickelbeck 2007-12-23 06:30:05 +00:00
parent 323b5b75fa
commit a7d68dd5fb
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -63,7 +63,7 @@ IF(wxWidgets_FOUND)
MESSAGE(STATUS "Check for installed wxWidgets -- found") MESSAGE(STATUS "Check for installed wxWidgets -- found")
# Include wxWidgets macros. # Include wxWidgets macros.
INCLUDE(${wxWidgets_USE_FILE}) INCLUDE(${wxWidgets_USE_FILE})
# We define the include paths here. # We define the include paths here.
# Include dirs for wxWidgets was defined before. # Include dirs for wxWidgets was defined before.
@ -71,7 +71,7 @@ IF(wxWidgets_FOUND)
${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/share) ${CMAKE_CURRENT_SOURCE_DIR}/share)
# CMake will look at this dirs for nested 'CMakeLists.txt' files # CMake will look in these dirs for nested 'CMakeLists.txt' files
ADD_SUBDIRECTORY(common) ADD_SUBDIRECTORY(common)
ADD_SUBDIRECTORY(3d-viewer) ADD_SUBDIRECTORY(3d-viewer)
ADD_SUBDIRECTORY(cvpcb) ADD_SUBDIRECTORY(cvpcb)
@ -82,7 +82,7 @@ IF(wxWidgets_FOUND)
ELSE(wxWidgets_FOUND) ELSE(wxWidgets_FOUND)
# For convenience. When we cannot continue, inform the user. # For convenience. When we cannot continue, inform the user.
MESSAGE(STATUS "Check for installed wxWidgets -- not found") MESSAGE(STATUS "Check for installed wxWidgets -- not found")
MESSAGE(FATAL_ERROR "wxWidgets was not found - it is required to build KiCad") MESSAGE(FATAL_ERROR "wxWidgets was not found - it is required to build KiCad")
ENDIF(wxWidgets_FOUND) ENDIF(wxWidgets_FOUND)
# CMake will look at this dirs for nested 'CMakeLists.txt' files # CMake will look at this dirs for nested 'CMakeLists.txt' files

12
pcbnew/CMakeLists.txt
View File

@ -1,7 +1,13 @@
ADD_DEFINITIONS(-DPCBNEW) ADD_DEFINITIONS(-DPCBNEW)
FIND_PACKAGE(Boost)
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${Boost_INCLUDE_DIRS}
bitmaps bitmaps
../3d-viewer ../3d-viewer
../polygon ../polygon
@ -116,7 +122,7 @@ SET(PCBNEW_SRCS
set_color.cpp set_color.cpp
set_grid.cpp set_grid.cpp
solve.cpp solve.cpp
# specctra.cpp # specctra.cpp
surbrill.cpp surbrill.cpp
swap_layers.cpp swap_layers.cpp
tool_modedit.cpp tool_modedit.cpp
@ -159,6 +165,10 @@ SET_SOURCE_FILES_PROPERTIES( dsn.cpp PROPERTIES COMPILE_FLAGS -DSTANDALONE )
ADD_EXECUTABLE( dsntest EXCLUDE_FROM_ALL dsn.cpp ) ADD_EXECUTABLE( dsntest EXCLUDE_FROM_ALL dsn.cpp )
TARGET_LINK_LIBRARIES( dsntest common ${wxWidgets_LIBRARIES} ) TARGET_LINK_LIBRARIES( dsntest common ${wxWidgets_LIBRARIES} )
SET_SOURCE_FILES_PROPERTIES( specctra.cpp PROPERTIES COMPILE_FLAGS -DSTANDALONE )
ADD_EXECUTABLE( specctra_test EXCLUDE_FROM_ALL specctra.cpp )
TARGET_LINK_LIBRARIES( specctra_test common ${wxWidgets_LIBRARIES} )
TARGET_LINK_LIBRARIES(pcbnew common 3d-viewer ${wxWidgets_LIBRARIES}) TARGET_LINK_LIBRARIES(pcbnew common 3d-viewer ${wxWidgets_LIBRARIES})