diff --git a/CMakeLists.txt b/CMakeLists.txt index fe36152386118e9fd0614df9835a93d4ece73f07..a52da9deada1dbbd6b45ba52038215f87ee64dc3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,8 +63,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) set(Boost_USE_MULTITHREADED ON) set(Boost_DEBUG ON) -set(CMAKE_INCLUDE_PATH ${BOOST_INCLUDEDIR} "${CMAKE_CURRENT_LIST_DIR}/external_dependencies/boost" ${CMAKE_INCLUDE_PATH}) -set(CMAKE_LIBRARY_PATH ${BOOST_LIBRARYDIR} "${CMAKE_CURRENT_LIST_DIR}/external_dependencies/boost/stage/lib" ${CMAKE_LIBRARY_PATH}) +#set(CMAKE_INCLUDE_PATH ${BOOST_INCLUDEDIR} "${CMAKE_CURRENT_LIST_DIR}/external_dependencies/boost" ${CMAKE_INCLUDE_PATH}) +#set(CMAKE_LIBRARY_PATH ${BOOST_LIBRARYDIR} "${CMAKE_CURRENT_LIST_DIR}/external_dependencies/boost/stage/lib" ${CMAKE_LIBRARY_PATH}) message("CMAKE_INCLUDE_PATH: ${CMAKE_INCLUDE_PATH}") message("CMAKE_LIBRARY_PATH: ${CMAKE_LIBRARY_PATH}") diff --git a/FindBoost.cmake b/FindBoost.cmake index fb597a993f43f73bbd61c9de7260ded0060675fe..6e0d5b239ca6c2808cfdc00a7d625b7189e6004b 100644 --- a/FindBoost.cmake +++ b/FindBoost.cmake @@ -142,15 +142,11 @@ foreach(LIBNAME ${REQUESTED_BOOST_LIBS}) message(FATAL_ERROR "Boost library ${LIBNAME} was NOT found!\ Please, set variable BOOST_LIBRARYDIR to the correct path and check the library names\ format in your Boost installation.") + else() + message("${LIBNAME} was found: ${${LIBNAME}}") endif() - - # Make the target of the same name as the library - #add_library(${LIBNAME}_tar STATIC IMPORTED) - get_filename_component(TMP ${${LIBNAME}} ABSOLUTE) - #set_property(TARGET ${LIBNAME}_tar PROPERTY IMPORTED_LOCATION ${TMP}) - - list(APPEND Boost_LIBRARIES ${TMP}) + list(APPEND Boost_LIBRARIES ${${LIBNAME}}) endforeach()