diff --git a/CMakeLists.txt b/CMakeLists.txt index 194affe2de..c56285e098 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,7 +63,7 @@ IF(wxWidgets_FOUND) MESSAGE(STATUS "Check for installed wxWidgets -- found") # Include wxWidgets macros. - INCLUDE(${wxWidgets_USE_FILE}) + INCLUDE(${wxWidgets_USE_FILE}) # We define the include paths here. # Include dirs for wxWidgets was defined before. @@ -71,7 +71,7 @@ IF(wxWidgets_FOUND) ${CMAKE_CURRENT_SOURCE_DIR}/include ${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(3d-viewer) ADD_SUBDIRECTORY(cvpcb) @@ -82,7 +82,7 @@ IF(wxWidgets_FOUND) ELSE(wxWidgets_FOUND) # For convenience. When we cannot continue, inform the user. 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) # CMake will look at this dirs for nested 'CMakeLists.txt' files diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt index 8d964d07d8..2abec60fc2 100644 --- a/pcbnew/CMakeLists.txt +++ b/pcbnew/CMakeLists.txt @@ -1,7 +1,13 @@ ADD_DEFINITIONS(-DPCBNEW) +FIND_PACKAGE(Boost) + +INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) + + INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} + ${Boost_INCLUDE_DIRS} bitmaps ../3d-viewer ../polygon @@ -116,7 +122,7 @@ SET(PCBNEW_SRCS set_color.cpp set_grid.cpp solve.cpp -# specctra.cpp +# specctra.cpp surbrill.cpp swap_layers.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 ) 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})