Commit ccd4acad authored by Martin Beseda's avatar Martin Beseda

Merge branch 'tmp' of code.it4i.cz:bes0030/4Neuro into tmp

parents 4c1a2aa3 162e558c
......@@ -1220,7 +1220,8 @@ if(_Boost_CHANGE_INCDIR AND NOT _Boost_INCLUDE_DIR_CHANGED)
endif()
if(NOT Boost_INCLUDE_DIR)
set(_boost_INCLUDE_SEARCH_DIRS "")
set(_boost_INCLUDE_SEARCH_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies/boost")
if(BOOST_INCLUDEDIR)
list(APPEND _boost_INCLUDE_SEARCH_DIRS ${BOOST_INCLUDEDIR})
elseif(_ENV_BOOST_INCLUDEDIR)
......@@ -1231,6 +1232,8 @@ if(NOT Boost_INCLUDE_DIR)
list(APPEND _boost_INCLUDE_SEARCH_DIRS ${BOOST_ROOT}/include ${BOOST_ROOT} ${BOOST_ROOT}/boost)
elseif( _ENV_BOOST_ROOT )
list(APPEND _boost_INCLUDE_SEARCH_DIRS ${_ENV_BOOST_ROOT}/include ${_ENV_BOOST_ROOT} ${_ENV_BOOST_ROOT}/boost)
else()
set(BOOST_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies/boost")
endif()
if( Boost_NO_SYSTEM_PATHS)
......@@ -1572,8 +1575,9 @@ foreach(c DEBUG RELEASE)
C:/boost/lib
C:/boost
/sw/local/lib
external_dependencies/boost/lib
${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies/boost/libs
)
message("_boost_LIBRARY_SEARCH_DIRS_${c}: ${_boost_LIBRARY_SEARCH_DIRS_${c}}")
endif()
endif()
endforeach()
......@@ -2135,5 +2139,10 @@ list(SORT _Boost_COMPONENTS_SEARCHED)
set(_Boost_COMPONENTS_SEARCHED "${_Boost_COMPONENTS_SEARCHED}"
CACHE INTERNAL "Components requested for this build tree.")
# Restore project's policies
#Restore project's policies
cmake_policy(POP)
message("${BOOST_ROOT}")
message("${BOOST_INCLUDEDIR}")
message("${BOOST_INCLUDE_DIR}")
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment