Commit cd041404 authored by Johan Ström's avatar Johan Ström

FreeBSD: fix include, avoid conflicts when json.h exists globally

parent 7b47723f
......@@ -22,8 +22,6 @@ set (INSTALL_PREFIX /usr)
if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
set (OS_FREEBSD YES)
set (INSTALL_PREFIX /usr/local)
include_directories("${INSTALL_PREFIX}/include")
link_directories(${INSTALL_PREFIX}/lib)
elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
set (OS_LINUX YES)
set (INSTALL_PREFIX /usr)
......@@ -164,6 +162,9 @@ else()
find_package(Boost COMPONENTS REQUIRED date_time)
endif()
pkg_search_module(UUID REQUIRED uuid)
log_pkg_found(uuid "${UUID_FOUND}" "${UUID_VERSION}" FATAL_ERROR "")
pkg_search_module(YAML_CPP REQUIRED yaml-cpp yaml-cpp03)
log_pkg_found(yamlcpp "${YAML_CPP_FOUND}" "${YAML_CPP_VERSION}" FATAL_ERROR "")
......
......@@ -15,9 +15,7 @@ if(OS_FREEBSD)
ENDIF ()
ENDIF (OS_FREEBSD)
# Use BEFORE to allow local installation of Zwave to take priority
# over global installation.
include_directories(BEFORE ${OpenZWave_INCLUDE_DIRS})
include_directories(${OpenZWave_INCLUDE_DIRS})
set (DEVICE "agozwave")
......
......@@ -24,13 +24,13 @@ endif()
set (AGOCLIENT_LIBRARIES
agocore
dl
${AUGEAS_LIBRARIES}
${AUGEAS_LDFLAGS}
${Boost_FILESYSTEM_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY}
)
set (AGOCORE_LIBRARIES
uuid
${UUID_LDFLAGS}
${Boost_LOG_LIBRARY}
${Boost_SYSTEM_LIBRARY}
${Boost_THREAD_LIBRARY}
......
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