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

CMakeLists \t -> 4 spaces

parent fe79cd50
......@@ -18,45 +18,45 @@ find_package(PythonNaive)
# FreeBSD have some differences in building, mainly
# that non-base libs/includes are located in /usr/local.
IF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
set (FREEBSD YES)
set (LOCALDIR /usr/local)
include_directories("${LOCALDIR}/include")
LINK_DIRECTORIES(${LOCALDIR}/lib)
set (FREEBSD YES)
set (LOCALDIR /usr/local)
include_directories("${LOCALDIR}/include")
LINK_DIRECTORIES(${LOCALDIR}/lib)
ELSE (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
set (LOCALDIR /usr)
set (LOCALDIR /usr)
ENDIF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
# See README.OSX
IF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
include_directories("./local-include")
include_directories("./local-include")
ENDIF ()
# some configurable values
IF (FREEBSD)
set (BASEDIR ${LOCALDIR}/agocontrol CACHE STRING "Directory to store agocontrol installation")
set (BINDIR ${BASEDIR}/bin CACHE STRING "Directory to store Binaries")
set (ETCDIR ${LOCALDIR}/etc CACHE STRING "Directory for system-wide settings")
set (LIBDIR /usr/lib CACHE STRING "Directory for libraries")
set (CONFDIR ${ETCDIR}/agocontrol CACHE STRING "Directory for agocontrol settings")
set (INCDIR ${LOCALDIR}/include/agocontrol CACHE STRING "Directory for include files")
# XXX: Not sure what "variable" data is, but only .sql files are installed currently,
# and those should be stored in share.
set (DATADIR ${LOCALDIR}/share/agocontrol CACHE STRING "Directory for variable data")
set (LOCALSTATEDIR ${LOCALDIR}/var/agocontrol CACHE STRING "Directory for state info")
set (HTMLDIR ${BASEDIR}/html CACHE STRING "Directory for rpc HTML files")
set (AUGEASLENSEDIR ${LOCALDIR}/share/augeas/lenses CACHE STRING "Directory for augeas lenses")
set (BASEDIR ${LOCALDIR}/agocontrol CACHE STRING "Directory to store agocontrol installation")
set (BINDIR ${BASEDIR}/bin CACHE STRING "Directory to store Binaries")
set (ETCDIR ${LOCALDIR}/etc CACHE STRING "Directory for system-wide settings")
set (LIBDIR /usr/lib CACHE STRING "Directory for libraries")
set (CONFDIR ${ETCDIR}/agocontrol CACHE STRING "Directory for agocontrol settings")
set (INCDIR ${LOCALDIR}/include/agocontrol CACHE STRING "Directory for include files")
# XXX: Not sure what "variable" data is, but only .sql files are installed currently,
# and those should be stored in share.
set (DATADIR ${LOCALDIR}/share/agocontrol CACHE STRING "Directory for variable data")
set (LOCALSTATEDIR ${LOCALDIR}/var/agocontrol CACHE STRING "Directory for state info")
set (HTMLDIR ${BASEDIR}/html CACHE STRING "Directory for rpc HTML files")
set (AUGEASLENSEDIR ${LOCALDIR}/share/augeas/lenses CACHE STRING "Directory for augeas lenses")
ELSE (FREEBSD)
set (BASEDIR /opt/agocontrol CACHE STRING "Directory to store agocontrol installation")
set (BINDIR ${BASEDIR}/bin CACHE STRING "Directory to store Binaries")
set (ETCDIR /etc CACHE STRING "Directory for system-wide settings")
set (LIBDIR /usr/lib CACHE STRING "Directory for libraries")
set (CONFDIR ${ETCDIR}/opt/agocontrol CACHE STRING "Directory for agocontrol settings")
set (INCDIR /usr/include/agocontrol CACHE STRING "Directory for include files")
set (DATADIR /var/opt/agocontrol CACHE STRING "Directory for variable data")
set (LOCALSTATEDIR /var/opt/agocontrol CACHE STRING "Directory for state info")
set (HTMLDIR ${BASEDIR}/html CACHE STRING "Directory for rpc HTML files")
set (AUGEASLENSEDIR /usr/share/augeas/lenses CACHE STRING "Directory for augeas lenses")
set (CMAKE_EXE_LINKER_FLAGS "-Wl,-z,now")
set (BASEDIR /opt/agocontrol CACHE STRING "Directory to store agocontrol installation")
set (BINDIR ${BASEDIR}/bin CACHE STRING "Directory to store Binaries")
set (ETCDIR /etc CACHE STRING "Directory for system-wide settings")
set (LIBDIR /usr/lib CACHE STRING "Directory for libraries")
set (CONFDIR ${ETCDIR}/opt/agocontrol CACHE STRING "Directory for agocontrol settings")
set (INCDIR /usr/include/agocontrol CACHE STRING "Directory for include files")
set (DATADIR /var/opt/agocontrol CACHE STRING "Directory for variable data")
set (LOCALSTATEDIR /var/opt/agocontrol CACHE STRING "Directory for state info")
set (HTMLDIR ${BASEDIR}/html CACHE STRING "Directory for rpc HTML files")
set (AUGEASLENSEDIR /usr/share/augeas/lenses CACHE STRING "Directory for augeas lenses")
set (CMAKE_EXE_LINKER_FLAGS "-Wl,-z,now")
ENDIF (FREEBSD)
set (PYTHON2DIST ${LOCALDIR}/${Python2_SITELIB} CACHE STRING "Directory for Python 2.7 packages")
......@@ -64,28 +64,28 @@ set (PYTHON3DIST ${LOCALDIR}/${Python3_SITELIB} CACHE STRING "Directory for Pyth
# Enable C++11
if (CMAKE_VERSION VERSION_LESS "3.1")
# Used on Debian Jessie builders
# Used on Debian Jessie builders
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
# Note: must ont set for CFLAGS!
# Note: must ont set for CFLAGS!
set (CMAKE_CXX_FLAGS "-std=gnu++11 ${CMAKE_CXX_FLAGS}")
endif ()
else ()
set (CMAKE_CXX_STANDARD 11)
set (CMAKE_CXX_STANDARD 11)
endif ()
set_property( DIRECTORY
APPEND PROPERTY
COMPILE_OPTIONS
-Wall
-DBOOST_LOG_DYN_LINK
-DBOOST_FILESYSTEM_VERSION=3
-DBOOST_FILESYSTEM_NO_DEPRECATED
# Workaround for bug in Boost on Clang which tries to add pragma warning group keyward-warning
# which does not exists in clang:
# http://lists.boost.org/Archives/boost/2016/07/230350.php
-Wno-error=unknown-pragmas
)
APPEND PROPERTY
COMPILE_OPTIONS
-Wall
-DBOOST_LOG_DYN_LINK
-DBOOST_FILESYSTEM_VERSION=3
-DBOOST_FILESYSTEM_NO_DEPRECATED
# Workaround for bug in Boost on Clang which tries to add pragma warning group keyward-warning
# which does not exists in clang:
# http://lists.boost.org/Archives/boost/2016/07/230350.php
-Wno-error=unknown-pragmas
)
# add the binary tree to the search path for include files
# so that we will find version.h and other configured files
......@@ -133,8 +133,8 @@ pkg_search_module(LIBRRD librrd)
log_pkg_found(librrd "${LIBRRD_FOUND}" "${LIBRRD_VERSION}" WARNING ", parts of core will not be built")
if(NOT FREEBSD)
# used by agosystem
pkg_search_module(LIBPROCPS REQUIRED libprocps)
# used by agosystem
pkg_search_module(LIBPROCPS REQUIRED libprocps)
log_pkg_found(libprocps "${LIBPROCPS_FOUND}" "${LIBPROCPS_VERSION}" WARNING "")
find_package(LinuxI2C)
......@@ -161,12 +161,12 @@ include_directories(${Boost_INCLUDE_DIRS})
# https://stackoverflow.com/questions/35007134/c-boost-undefined-reference-to-boostfilesystemdetailcopy-file
# https://chaste.cs.ox.ac.uk/trac/wiki/ChasteGuides/ModernCpp#Boostscopedenumsforboost1.56
IF(Boost_VERSION VERSION_LESS 105600)
message(STATUS "Boost version < 1.56, building with BOOST_NO_CXX11_SCOPED_ENUMS")
set_property( DIRECTORY
APPEND PROPERTY
COMPILE_OPTIONS
-DBOOST_NO_CXX11_SCOPED_ENUMS
)
message(STATUS "Boost version < 1.56, building with BOOST_NO_CXX11_SCOPED_ENUMS")
set_property( DIRECTORY
APPEND PROPERTY
COMPILE_OPTIONS
-DBOOST_NO_CXX11_SCOPED_ENUMS
)
ENDIF()
find_package(CppUnit)
......@@ -181,10 +181,10 @@ set (RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${BINDIR}")
get_filename_component(CMAKE_CURRENT_SOURCE_DIR_REAL "${CMAKE_CURRENT_SOURCE_DIR}" REALPATH)
get_filename_component(CMAKE_CURRENT_BINARY_DIR_REAL "${CMAKE_CURRENT_BINARY_DIR}" REALPATH)
if ("${CMAKE_CURRENT_SOURCE_DIR_REAL}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR_REAL}")
set (IN_SOURCE_BUILD TRUE)
message(WARNING "In-Source build is not recommended. Instead, create a separate directory and run cmake /path/to/source")
set (IN_SOURCE_BUILD TRUE)
message(WARNING "In-Source build is not recommended. Instead, create a separate directory and run cmake /path/to/source")
else()
set (IN_SOURCE_BUILD FALSE)
set (IN_SOURCE_BUILD FALSE)
endif()
# Shared for all
......@@ -198,9 +198,9 @@ endif()
OPTION(BUILD_TESTS "Build the unittests" ON)
if (BUILD_TESTS AND CPPUNIT_FOUND)
# These are only for Shared right now, so add them right after.
enable_testing()
add_subdirectory (unittest)
# These are only for Shared right now, so add them right after.
enable_testing()
add_subdirectory (unittest)
endif()
OPTION(BUILD_CORE "Build the CORE" ON)
......@@ -233,7 +233,7 @@ endif()
# configure a header file to pass some of the CMake settings
# to the source code
configure_file (
"${PROJECT_SOURCE_DIR}/build_config.h.in"
"${PROJECT_BINARY_DIR}/build_config.h"
@ONLY
"${PROJECT_SOURCE_DIR}/build_config.h.in"
"${PROJECT_BINARY_DIR}/build_config.h"
@ONLY
)
......@@ -9,9 +9,9 @@ cmake_minimum_required (VERSION 3.0)
# )
set_property( DIRECTORY
APPEND PROPERTY
COMPILE_OPTIONS
-Werror)
APPEND PROPERTY
COMPILE_OPTIONS
-Werror)
install (PROGRAMS myavahi.py agoctrl.sh DESTINATION ${BINDIR})
install (DIRECTORY DESTINATION ${CONFDIR}/schema.d)
......
......@@ -9,8 +9,8 @@ configure_file (
file (GLOB_RECURSE AGOLUA_SOURCE_FILES *.cpp)
set (LUA_LIBRARIES
agoclient
${Boost_REGEX_LIBRARY}
${LUA_LIBRARIES}
${Boost_REGEX_LIBRARY}
${LUA_LIBRARIES}
)
include_directories(${LUA_INCLUDE_DIRS})
......
......@@ -15,8 +15,8 @@ set (RPCPASSWD_LIBRARIES
)
IF (NOT FREEBSD)
list(APPEND RPC_LIBRARIES dl )
list(APPEND RPCPASSWD_LIBRARIES dl )
list(APPEND RPC_LIBRARIES dl )
list(APPEND RPCPASSWD_LIBRARIES dl )
ENDIF (NOT FREEBSD)
# add the executable
......@@ -29,9 +29,9 @@ add_executable (rpc-htpasswd rpc-htpasswd.cpp)
target_link_libraries (rpc-htpasswd ${RPCPASSWD_LIBRARIES})
set_property(
TARGET agorpc
PROPERTY COMPILE_DEFINITIONS
DEFAULT_HTMLDIR=${HTMLDIR}
TARGET agorpc
PROPERTY COMPILE_DEFINITIONS
DEFAULT_HTMLDIR=${HTMLDIR}
)
......
......@@ -2,4 +2,4 @@ cmake_minimum_required (VERSION 3.0)
AgoPythonProgram(owfs
DESCRIPTION "ago control 1-Wire Device"
WITH_CONFIGDIR)
\ No newline at end of file
WITH_CONFIGDIR)
......@@ -75,7 +75,7 @@ IF (NOT OpenLighting_FOUND)
ENDIF ()
if(NOT HAVE_I2C_SMBUS)
list(REMOVE_ITEM AGODEVICES i2c blinkm)
list(REMOVE_ITEM AGODEVICES i2c blinkm)
MESSAGE(STATUS "Linux i2c smbus not found, not building i2c & blinkm devices")
endif()
......@@ -85,13 +85,13 @@ if(NOT LIBCURL_FOUND)
endif()
IF (FREEBSD)
# These does not build on FreeBSD currently
list(REMOVE_ITEM AGODEVICES
firmata # S_IRUSR
PLCBUS # TCIFLUSH / TCIOFLUSH
MySensors # TCIFLUSH / TCIOFLUSH
zmcam # error: member access into incomplete type 'struct sockaddr_in'
)
# These does not build on FreeBSD currently
list(REMOVE_ITEM AGODEVICES
firmata # S_IRUSR
PLCBUS # TCIFLUSH / TCIOFLUSH
MySensors # TCIFLUSH / TCIOFLUSH
zmcam # error: member access into incomplete type 'struct sockaddr_in'
)
ENDIF (FREEBSD)
AgoPythonProgram(simulator DESCRIPTION "ago control Device simulator")
......
cmake_minimum_required (VERSION 3.0)
AgoPythonProgram(eta DESCRIPTION "ago control ETAtouch service")
\ No newline at end of file
AgoPythonProgram(eta DESCRIPTION "ago control ETAtouch service")
......@@ -2,4 +2,4 @@ cmake_minimum_required (VERSION 3.0)
AgoPythonProgram(mqtt
DESCRIPTION "ago control MQTT client"
EXTRA_FILES agomqttpahoclient.py)
\ No newline at end of file
EXTRA_FILES agomqttpahoclient.py)
......@@ -2,4 +2,4 @@ cmake_minimum_required (VERSION 3.0)
AgoPythonProgram(apc
DESCRIPTION "ago control agoapc system"
WITH_CONFIGDIR)
\ No newline at end of file
WITH_CONFIGDIR)
......@@ -2,4 +2,4 @@ cmake_minimum_required (VERSION 3.0)
AgoPythonProgram(jointspace
DESCRIPTION "ago control JointSpace Device"
WITH_CONFIGDIR)
\ No newline at end of file
WITH_CONFIGDIR)
......@@ -2,4 +2,4 @@ cmake_minimum_required (VERSION 3.0)
AgoPythonProgram(alert
DESCRIPTION "ago control agoalert system"
EXTRA_FILES pushbullet.py)
\ No newline at end of file
EXTRA_FILES pushbullet.py)
cmake_minimum_required (VERSION 3.0)
AgoPythonProgram(asterisk DESCRIPTION "ago control Asterisk PBX interface")
\ No newline at end of file
AgoPythonProgram(asterisk DESCRIPTION "ago control Asterisk PBX interface")
cmake_minimum_required (VERSION 3.0)
AgoPythonProgram(axisaudiotransmit DESCRIPTION "ago control axis audio transmit device")
\ No newline at end of file
AgoPythonProgram(axisaudiotransmit DESCRIPTION "ago control axis audio transmit device")
......@@ -14,4 +14,4 @@ target_link_libraries (${DEVICE} ${DEVICE_EXTRA_LIBRARIES})
install (TARGETS ${DEVICE} RUNTIME DESTINATION ${BINDIR})
AgoService(blinkm DESCRIPTION "ago control blinkm i2c device")
\ No newline at end of file
AgoService(blinkm DESCRIPTION "ago control blinkm i2c device")
cmake_minimum_required (VERSION 3.0)
AgoPythonProgram(enigma2 DESCRIPTION "ago control Enigma2/Dreambox interface")
\ No newline at end of file
AgoPythonProgram(enigma2 DESCRIPTION "ago control Enigma2/Dreambox interface")
......@@ -16,4 +16,4 @@ target_link_libraries (${DEVICE} ${DEVICE_EXTRA_LIBRARIES})
install (TARGETS ${DEVICE} RUNTIME DESTINATION ${BINDIR})
AgoService(firmata DESCRIPTION "ago control Arduino Firmata Device")
\ No newline at end of file
AgoService(firmata DESCRIPTION "ago control Arduino Firmata Device")
cmake_minimum_required (VERSION 3.0)
AgoPythonProgram(gammu DESCRIPTION "ago control gammu sms gateway")
\ No newline at end of file
AgoPythonProgram(gammu DESCRIPTION "ago control gammu sms gateway")
cmake_minimum_required (VERSION 3.0)
AgoPythonProgram(gc100 DESCRIPTION "ago control gc100 interface")
\ No newline at end of file
AgoPythonProgram(gc100 DESCRIPTION "ago control gc100 interface")
......@@ -14,4 +14,4 @@ target_link_libraries (${DEVICE} ${DEVICE_EXTRA_LIBRARIES})
install (TARGETS ${DEVICE} RUNTIME DESTINATION ${BINDIR})
AgoService(i2c DESCRIPTION "ago control i2c device")
\ No newline at end of file
AgoService(i2c DESCRIPTION "ago control i2c device")
......@@ -2,4 +2,4 @@ cmake_minimum_required (VERSION 3.0)
AgoPythonProgram(ipx800
DESCRIPTION "ago control IPX800"
EXTRA_FILES pyipx800v3.py)
\ No newline at end of file
EXTRA_FILES pyipx800v3.py)
......@@ -14,4 +14,4 @@ target_link_libraries (${DEVICE} ${DEVICE_EXTRA_LIBRARIES})
install (TARGETS ${DEVICE} RUNTIME DESTINATION ${BINDIR})
AgoService(irtrans_ethernet DESCRIPTION "ago control IRTrans Ethernet infrared blaster Device")
\ No newline at end of file
AgoService(irtrans_ethernet DESCRIPTION "ago control IRTrans Ethernet infrared blaster Device")
......@@ -18,4 +18,4 @@ target_link_libraries (${DEVICE} ${DEVICE_EXTRA_LIBRARIES})
install (TARGETS ${DEVICE} RUNTIME DESTINATION ${BINDIR})
AgoService(knx DESCRIPTION "ago control KNX Device")
\ No newline at end of file
AgoService(knx DESCRIPTION "ago control KNX Device")
......@@ -10,4 +10,4 @@ set(EXTRA_FILES lifxbase.py lifxnet.py lifxlan2.py prodinfo.json ${LIFXLAN_FILES
AgoPythonProgram(lifx
DESCRIPTION "ago control LIFX handler"
EXTRA_FILES "${EXTRA_FILES}")
\ No newline at end of file
EXTRA_FILES "${EXTRA_FILES}")
cmake_minimum_required (VERSION 3.0)
AgoPythonProgram(netmetrics)
\ No newline at end of file
AgoPythonProgram(netmetrics)
......@@ -2,4 +2,4 @@ cmake_minimum_required (VERSION 3.0)
AgoPythonProgram(iscp
DESCRIPTION "ago control Onkyo ISCP device"
EXTRA_FILES core.py commands.py)
\ No newline at end of file
EXTRA_FILES core.py commands.py)
......@@ -2,4 +2,4 @@ cmake_minimum_required (VERSION 3.0)
AgoPythonProgram(raspiGPIO
DESCRIPTION "ago control raspberry pi GPIO Device"
RUN_AS root)
\ No newline at end of file
RUN_AS root)
......@@ -2,4 +2,4 @@ cmake_minimum_required (VERSION 3.0)
AgoPythonProgram(raspiMCP3xxxGPIO
DESCRIPTION "ago raspberry pi MCPxxx GPIO device"
RUN_AS root)
\ No newline at end of file
RUN_AS root)
......@@ -2,4 +2,4 @@ cmake_minimum_required (VERSION 3.0)
AgoPythonProgram(rrdtool
DESCRIPTION "ago control advanced graphing system based on rrdtool"
EXTRA_FILES RRDtool.py)
\ No newline at end of file
EXTRA_FILES RRDtool.py)
cmake_minimum_required (VERSION 3.0)
# This is conflicting with core/scheduler; renaming to schedulerold
AgoPythonProgram(schedulerold)
\ No newline at end of file
AgoPythonProgram(schedulerold)
......@@ -4,4 +4,4 @@ set(EXTRA_FILES pylmsserver.py pylmslibrary.py pylmsplayer.py pylmsplaylist.py)
AgoPythonProgram(squeezebox
DESCRIPTION "ago control Squeezebox devices"
EXTRA_FILES "${EXTRA_FILES}")
\ No newline at end of file
EXTRA_FILES "${EXTRA_FILES}")
cmake_minimum_required (VERSION 3.0)
AgoPythonProgram(logger DESCRIPTION "ago control agologger system")
\ No newline at end of file
AgoPythonProgram(logger DESCRIPTION "ago control agologger system")
......@@ -4,4 +4,4 @@ set(EXTRA_FILES tellstickbase.py tellstickduo.py tellsticknet.py tellstick_auth.
AgoPythonProgram(tellstick
DESCRIPTION "ago control Tellstick handler"
EXTRA_FILES ${EXTRA_FILES})
\ No newline at end of file
EXTRA_FILES ${EXTRA_FILES})
cmake_minimum_required (VERSION 3.0)
AgoPythonProgram(temperaturnu DESCRIPTION "ago control temperatur \"sensor\" getting data from http://temperatur.nu")
\ No newline at end of file
AgoPythonProgram(temperaturnu DESCRIPTION "ago control temperatur \"sensor\" getting data from http://temperatur.nu")
......@@ -4,4 +4,4 @@ set(EXTRA_FILES pinger.py configobj.py)
AgoPythonProgram(wake_on_lan
DESCRIPTION "ago control Wake on LAN handler"
EXTRA_FILES "${EXTRA_FILES}"
RUN_AS root)
\ No newline at end of file
RUN_AS root)
cmake_minimum_required (VERSION 3.0)
AgoPythonProgram(weatherreporter DESCRIPTION "ago control Weather Reporter service")
\ No newline at end of file
AgoPythonProgram(weatherreporter DESCRIPTION "ago control Weather Reporter service")
cmake_minimum_required (VERSION 3.0)
AgoPythonProgram(x10 DESCRIPTION "ago control X10 Device")
\ No newline at end of file
AgoPythonProgram(x10 DESCRIPTION "ago control X10 Device")
......@@ -8,11 +8,11 @@ set (DEVICE_EXTRA_LIBRARIES
)
IF (FREEBSD)
list(APPEND DEVICE_EXTRA_LIBRARIES usb)
IF(NOT EXISTS "/usr/include/iconv.h")
# Pre 10.0 FreeBSD without globla iconv
list(APPEND DEVICE_EXTRA_LIBRARIES iconv)
ENDIF ()
list(APPEND DEVICE_EXTRA_LIBRARIES usb)
IF(NOT EXISTS "/usr/include/iconv.h")
# Pre 10.0 FreeBSD without globla iconv
list(APPEND DEVICE_EXTRA_LIBRARIES iconv)
ENDIF ()
ENDIF (FREEBSD)
# Use BEFORE to allow local installation of Zwave to take priority
......@@ -26,11 +26,11 @@ add_executable (${DEVICE} ${DEVICE_SOURCE_FILES})
target_link_libraries (${DEVICE} ${DEVICE_EXTRA_LIBRARIES})
set_property(
TARGET ${DEVICE}
PROPERTY COMPILE_DEFINITIONS
OPENZWAVE_VERSION_MAJOR=${OpenZWave_VERSION_MAJOR}
OPENZWAVE_VERSION_MINOR=${OpenZWave_VERSION_MINOR}
OPENZWAVE_VERSION_REVISION=${OpenZWave_VERSION_REVISION}
TARGET ${DEVICE}
PROPERTY COMPILE_DEFINITIONS
OPENZWAVE_VERSION_MAJOR=${OpenZWave_VERSION_MAJOR}
OPENZWAVE_VERSION_MINOR=${OpenZWave_VERSION_MINOR}
OPENZWAVE_VERSION_REVISION=${OpenZWave_VERSION_REVISION}
)
install (TARGETS ${DEVICE} RUNTIME DESTINATION ${BINDIR})
......
cmake_minimum_required (VERSION 3.0)
set_property( DIRECTORY
APPEND PROPERTY
COMPILE_OPTIONS
-Werror)
APPEND PROPERTY
COMPILE_OPTIONS
-Werror)
OPTION(BUILD_GATEWAY_ImperiHome "Build ImperiHome gateway" ON)
if (BUILD_GATEWAY_ImperiHome)
......@@ -12,6 +12,6 @@ endif()
OPTION(BUILD_GATEWAY_meloware "Build Meloware Lightswitchserver Gateway" ON)
if (BUILD_GATEWAY_meloware)
AgoPythonProgram(meloware DESCRIPTION "ago control Meloware Lightswitchserver Gateway")
AgoPythonProgram(meloware DESCRIPTION "ago control Meloware Lightswitchserver Gateway")
endif()
......@@ -10,7 +10,7 @@ set (IMPERIHOME_LIBRARIES
)
IF (NOT FREEBSD)
list(APPEND IMPERIHOME_LIBRARIES dl )
list(APPEND IMPERIHOME_LIBRARIES dl )
ENDIF (NOT FREEBSD)
# add the executable
......@@ -18,9 +18,9 @@ add_executable (agoImperiHome agoImperiHome.cpp)
target_link_libraries (agoImperiHome ${IMPERIHOME_LIBRARIES})
set_property(
TARGET agoImperiHome
PROPERTY COMPILE_DEFINITIONS
DEFAULT_HTMLDIR=${HTMLDIR}
TARGET agoImperiHome
PROPERTY COMPILE_DEFINITIONS
DEFAULT_HTMLDIR=${HTMLDIR}
)
install (TARGETS agoImperiHome RUNTIME DESTINATION ${BINDIR})
......
......@@ -20,7 +20,7 @@ set (AGOHTTP_LIBRARIES
)
#IF (Boost_LOG_FOUND)
# LIST(APPEND AGOHTTP_LIBRARIES ${Boost_LOG_LIBRARY})
# LIST(APPEND AGOHTTP_LIBRARIES ${Boost_LOG_LIBRARY})
#ENDIF()
target_link_libraries (agohttp ${AGOHTTP_LIBRARIES})
......@@ -37,4 +37,4 @@ set_property(
COMPILE_OPTIONS
-Werror)
install (TARGETS agohttp LIBRARY DESTINATION ${LIBDIR})
\ No newline at end of file
install (TARGETS agohttp LIBRARY DESTINATION ${LIBDIR})
......@@ -2,9 +2,9 @@ cmake_minimum_required (VERSION 3.0)
set(TEST_SOURCE_FILES
runner.cpp
shared/test_agoconfig.cpp
shared/test_config_namelist.cpp
shared/test_agojson.cpp
shared/test_agoconfig.cpp
shared/test_config_namelist.cpp
shared/test_agojson.cpp
)
set (TEST_LIBRARIES
......
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