Moved FIND_PACKAGE(Boost) to within the individual Find scripts that actually need it rather in the root CMakeLists.txt.
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@15093 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
parent
b964c53445
commit
41f284b678
@ -682,7 +682,6 @@ ELSE()
|
||||
ENDIF()
|
||||
FIND_PACKAGE(ZeroConf)
|
||||
|
||||
FIND_PACKAGE(Boost) # used by LIBLAS
|
||||
FIND_PACKAGE(LIBLAS)
|
||||
|
||||
IF (NOT(OSG_USE_LOCAL_LUA_SOURCE))
|
||||
|
@ -14,7 +14,9 @@ FIND_PATH(ASIO_INCLUDE_DIR
|
||||
)
|
||||
|
||||
SET(ASIO_FOUND "NO")
|
||||
IF(ASIO_INCLUDE_DIR)
|
||||
FIND_PACKAGE( Boost 1.37 )
|
||||
IF(Boost_FOUND AND ASIO_INCLUDE_DIR)
|
||||
IF(Boost_FOUND)
|
||||
SET(ASIO_FOUND "YES")
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
@ -98,6 +98,10 @@ FIND_LIBLAS_LIBRARY(LIBLASC_LIBRARY las_c)
|
||||
|
||||
set(LIBLAS_FOUND "NO")
|
||||
if(LIBLAS_LIBRARY AND LIBLASC_LIBRARY AND LIBLAS_INCLUDE_DIR)
|
||||
|
||||
FIND_PACKAGE(Boost) # used by LIBLAS
|
||||
if(Boost_FOUND)
|
||||
set(LIBLAS_LIBRARIES ${LIBLAS_LIBRARY} ${LIBLASC_LIBRARY} )
|
||||
set(LIBLAS_FOUND "YES")
|
||||
endif()
|
||||
endif()
|
||||
|
@ -266,7 +266,7 @@ ADD_SUBDIRECTORY(osc)
|
||||
ADD_SUBDIRECTORY(trk)
|
||||
ADD_SUBDIRECTORY(tf)
|
||||
|
||||
IF(Boost_INCLUDE_DIR AND LIBLAS_FOUND)
|
||||
IF(LIBLAS_FOUND)
|
||||
ADD_SUBDIRECTORY(las)
|
||||
ENDIF()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user