improved inc directory inclusion
This commit is contained in:
parent
f4069d02bf
commit
3f75484f77
@ -99,7 +99,7 @@ if (${WinBuild})
|
|||||||
message(STATUS "Using CURL lib(s): ${CURL_LIBRARIES}")
|
message(STATUS "Using CURL lib(s): ${CURL_LIBRARIES}")
|
||||||
message(STATUS "")
|
message(STATUS "")
|
||||||
|
|
||||||
include_directories(${CURL_INCLUDE_DIRS} inc)
|
include_directories(${CURL_INCLUDE_DIRS})
|
||||||
|
|
||||||
# configure libconfig
|
# configure libconfig
|
||||||
FIND_PATH(LIBCONFIG++_INCLUDE_DIRS libconfig.h++ /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/include/) # search for libconfig include headers
|
FIND_PATH(LIBCONFIG++_INCLUDE_DIRS libconfig.h++ /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/include/) # search for libconfig include headers
|
||||||
@ -108,7 +108,7 @@ if (${WinBuild})
|
|||||||
message(STATUS "Using LIBCONFIG++ include dir(s): ${LIBCONFIG++_INCLUDE_DIRS}")
|
message(STATUS "Using LIBCONFIG++ include dir(s): ${LIBCONFIG++_INCLUDE_DIRS}")
|
||||||
message(STATUS "Using LIBCONFIG++ lib(s): ${LIBCONFIG++_LIBRARIES}")
|
message(STATUS "Using LIBCONFIG++ lib(s): ${LIBCONFIG++_LIBRARIES}")
|
||||||
|
|
||||||
include_directories(${LIBCONFIG++_INCLUDE_DIRS} inc)
|
include_directories(${LIBCONFIG++_INCLUDE_DIRS})
|
||||||
else ()
|
else ()
|
||||||
find_package(CURL REQUIRED)
|
find_package(CURL REQUIRED)
|
||||||
if (CURL_INCLUDE_DIRS AND CURL_LIBRARIES)
|
if (CURL_INCLUDE_DIRS AND CURL_LIBRARIES)
|
||||||
@ -118,7 +118,7 @@ else ()
|
|||||||
else ()
|
else ()
|
||||||
message(FATAL_ERROR "Could not find CURL")
|
message(FATAL_ERROR "Could not find CURL")
|
||||||
endif ()
|
endif ()
|
||||||
include_directories(${CURL_INCLUDE_DIR} inc)
|
include_directories(${CURL_INCLUDE_DIR})
|
||||||
|
|
||||||
message("")
|
message("")
|
||||||
# libconfig
|
# libconfig
|
||||||
@ -140,6 +140,8 @@ else ()
|
|||||||
include_directories(${LIBCONFIG_INCLUDE_DIRS})
|
include_directories(${LIBCONFIG_INCLUDE_DIRS})
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
include_directories(inc)
|
||||||
|
|
||||||
message("")
|
message("")
|
||||||
|
|
||||||
#read sample config
|
#read sample config
|
||||||
|
Loading…
Reference in New Issue
Block a user