comparison CMakeLists.txt @ 99:b821d6270741

If we have turned USE_BOOST on, we actually require the packages.
author Tom Fredrik Blenning Klaussen <bfg@bfgconsult.no>
date Thu, 13 Feb 2014 14:53:35 +0100
parents 308a718812ba
children 9d9926a6011f
comparison
equal deleted inserted replaced
98:a591accb07b5 99:b821d6270741
42 42
43 SET(Boost_USE_MULTITHREADED ON) 43 SET(Boost_USE_MULTITHREADED ON)
44 SET(Boost_USE_STATIC_RUNTIME OFF) 44 SET(Boost_USE_STATIC_RUNTIME OFF)
45 IF(USE_HEADERS_FOR_BOOST_TEST) 45 IF(USE_HEADERS_FOR_BOOST_TEST)
46 SET(Boost_USE_STATIC_LIBS OFF) 46 SET(Boost_USE_STATIC_LIBS OFF)
47 FIND_PACKAGE(Boost COMPONENTS filesystem system) 47 FIND_PACKAGE(Boost COMPONENTS filesystem system REQUIRED)
48 ADD_DEFINITIONS( "-DBOOSTTEST_HEADER_INCLUDE" ) 48 ADD_DEFINITIONS( "-DBOOSTTEST_HEADER_INCLUDE" )
49 ELSE() 49 ELSE()
50 SET(Boost_USE_STATIC_LIBS ON) 50 SET(Boost_USE_STATIC_LIBS ON)
51 FIND_PACKAGE(Boost COMPONENTS filesystem system test_exec_monitor) 51 FIND_PACKAGE(Boost COMPONENTS filesystem system test_exec_monitor REQUIRED)
52 ENDIF() 52 ENDIF()
53 IF (Boost_FOUND) 53 IF (Boost_FOUND)
54 INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR}) 54 INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})
55 ADD_DEFINITIONS( "-DHAS_BOOST" ) 55 ADD_DEFINITIONS( "-DHAS_BOOST" )
56 ENDIF() 56 ENDIF()