Commit a7d68dd5 authored by dickelbeck's avatar dickelbeck
Browse files

added boost checking

parent 323b5b75

CMakeLists.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -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)

pcbnew/CMakeLists.txt

+11 −1
Original line number Original line Diff line number Diff line 
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
@@ -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})