Changeset 301 in pacpusframework for trunk/cmake/PacpusDependencies.cmake


Ignore:
Timestamp:
04/08/14 10:03:01 (10 years ago)
Author:
Marek Kurdej
Message:

Some Unix fixes

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        11build
         2CMakeLists.txt.user*

  • trunk/cmake/PacpusDependencies.cmake

    r285 r301  
    123123    list(APPEND PACPUS_DEPENDENCIES_LIB ${Boost_LIBRARIES})
    124124endif()
     125
    125126if(PACPUS_USE_LOG)
    126127    find_package(Boost 1.54.0 REQUIRED
    … …  
    130131            log_setup # log
    131132    )
    132     include_directories(${Boost_INCLUDE_DIRS})
    133     link_directories(${Boost_LIBRARY_DIRS})
     133    list(APPEND PACPUS_DEPENDENCIES_INC ${Boost_INCLUDE_DIRS})
     134    list(APPEND PACPUS_DEPENDENCIES_LIB ${Boost_LIBRARIES})
     135endif()
     136if(PACPUS_BUILD_TESTS)
     137    find_package(Boost 1.21.0 REQUIRED
     138        COMPONENTS
     139            unit_test_framework
     140    )
    134141    list(APPEND PACPUS_DEPENDENCIES_INC ${Boost_INCLUDE_DIRS})
    135142    list(APPEND PACPUS_DEPENDENCIES_LIB ${Boost_LIBRARIES})
Note: See TracChangeset for help on using the changeset viewer.