cmake: fix usage of INCLUDE_DIR/INCLUDE_DIRS in Dependencies.cmake
authorIvan Shapovalov <intelfx@intelfx.name>
Sun, 14 Aug 2016 01:52:25 +0000 (04:52 +0300)
committerIvan Shapovalov <intelfx@intelfx.name>
Wed, 31 Aug 2016 12:20:49 +0000 (15:20 +0300)
cmake/Dependencies.cmake

index ae9ce8e..bf882ce 100644 (file)
@@ -3,7 +3,7 @@ set(Caffe_LINKER_LIBS "")
 
 # ---[ Boost
 find_package(Boost 1.46 REQUIRED COMPONENTS system thread filesystem)
-include_directories(SYSTEM ${Boost_INCLUDE_DIR})
+include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
 list(APPEND Caffe_LINKER_LIBS ${Boost_LIBRARIES})
 
 # ---[ Threads
@@ -25,7 +25,7 @@ include(cmake/ProtoBuf.cmake)
 
 # ---[ HDF5
 find_package(HDF5 COMPONENTS HL REQUIRED)
-include_directories(SYSTEM ${HDF5_INCLUDE_DIRS} ${HDF5_HL_INCLUDE_DIR})
+include_directories(SYSTEM ${HDF5_INCLUDE_DIRS})
 list(APPEND Caffe_LINKER_LIBS ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES})
 
 # ---[ LMDB
@@ -42,7 +42,7 @@ endif()
 # ---[ LevelDB
 if(USE_LEVELDB)
   find_package(LevelDB REQUIRED)
-  include_directories(SYSTEM ${LevelDB_INCLUDE})
+  include_directories(SYSTEM ${LevelDB_INCLUDES})
   list(APPEND Caffe_LINKER_LIBS ${LevelDB_LIBRARIES})
   add_definitions(-DUSE_LEVELDB)
 endif()