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

CMake upgrades (pthread, min req 3.0)

Add proper threading library dependency (typically pthread), was not
included properly on raspbian.
Also bump to minimum CMake 3.0, should be satisfied everywhere.
parent 8077f115
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
project (agocontrol)
# The version number.
set (AGOCONTROL_VERSION 0.1)
......@@ -105,7 +104,8 @@ else()
endif ()
endif (CPPDB_FOUND)
FIND_PACKAGE(Boost COMPONENTS system filesystem thread program_options date_time regex REQUIRED)
find_package(Threads REQUIRED)
find_package(Boost COMPONENTS system filesystem thread program_options date_time regex REQUIRED)
include_directories(${Boost_INCLUDE_DIRS})
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
file (GLOB INIT_FILES *.in)
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
file (GLOB CONFD_FILES *.in)
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
file (GLOB SCHEMA_FILES *.yaml)
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
file (GLOB SYSTEMD_FILES *.in)
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
file (GLOB SYSV_FILES *.in)
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
# configure a header file to pass some of the CMake settings
# to the source code
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
file (GLOB_RECURSE AGODATALOGGER_SOURCE_FILES *.cpp)
set (DATALOGGER_LIBRARIES
agoclient
sqlite3
pthread
${Boost_PROGRAM_DATE_TIME_LIBRARY}
${Boost_PROGRAM_DATE_TIME_LIBRARY}
rrd
cppdb
)
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
set (DRAIN_LIBRARIES
agoclient
pthread
)
# add the executable
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
file (GLOB_RECURSE AGOEVENT_SOURCE_FILES *.cpp)
set (EVENT_LIBRARIES
agoclient
pthread
)
# add the executable
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
configure_file (
"${CMAKE_CURRENT_SOURCE_DIR}/command.lua.in"
......@@ -15,9 +15,8 @@ endif(FREEBSD)
file (GLOB_RECURSE AGOLUA_SOURCE_FILES *.cpp)
set (LUA_LIBRARIES
agoclient
pthread
${Boost_REGEX_LIBRARY}
${LUA}
${Boost_REGEX_LIBRARY}
${LUA}
)
# add the executable
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
set (MESSAGESEND_LIBRARIES
agoclient
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
file (GLOB_RECURSE AGORESOLVER_SOURCE_FILES *.cpp)
set (RESOLVER_LIBRARIES
sqlite3
agoclient
pthread
)
IF (FREEBSD)
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
IF(COMMAND cmake_policy)
cmake_policy(SET CMP0009 NEW)
......@@ -7,11 +7,9 @@ ENDIF(COMMAND cmake_policy)
set (RPC_LIBRARIES
agoclient
agohttp
pthread
)
set (RPCPASSWD_LIBRARIES
pthread
agohttp
)
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
set (SCENARIO_LIBRARIES
agoclient
pthread
)
# add the executable
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
install (PROGRAMS agoscheduler.py DESTINATION ${BINDIR})
install (PROGRAMS scheduler.py DESTINATION ${BINDIR})
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
set (SECURITY_LIBRARIES
agoclient
pthread
)
# add the executable
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
set (AGOSYSTEM_SOURCE_FILES agosystem.cpp)
IF (FREEBSD)
......@@ -16,7 +16,6 @@ ENDIF()
set (SYSTEM_LIBRARIES
agoclient
pthread
${Boost_PROGRAM_DATE_TIME_LIBRARY}
)
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
file (GLOB_RECURSE AGOTIMER_SOURCE_FILES *.cpp)
set (TIMER_LIBRARIES
agoclient
pthread
${Boost_DATE_TIME_LIBRARY}
${Boost_DATE_TIME_LIBRARY}
)
# add the executable
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
install (PROGRAMS agoowfs.py DESTINATION ${BINDIR})
install (DIRECTORY DESTINATION ${CONFDIR}/owfs)
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
set (AGODEVICES
shvt250
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
set (my_device_service "agoeta.service.in")
set (my_device_config "eta.conf.in")
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
install (PROGRAMS agomqtt.py DESTINATION ${BINDIR})
install (PROGRAMS agomqttpahoclient.py DESTINATION ${BINDIR})
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
file (GLOB_RECURSE DEVICE_SOURCE_FILES *.cpp)
......@@ -11,7 +11,6 @@ set(DEVICE_SOURCE_FILES
set (DEVICE_EXTRA_LIBRARIES
agoclient
${Boost_SYSTEM_LIBRARY}
pthread
)
set (DEVICE "agoMySensors")
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
file (GLOB_RECURSE DEVICE_SOURCE_FILES *.cpp)
set(DEVICE_SOURCE_FILES
......@@ -8,7 +8,6 @@ set(DEVICE_SOURCE_FILES
set (VIDEO_LIBRARIES
agoclient
pthread
opencv_core
opencv_imgproc
opencv_objdetect
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
file (GLOB_RECURSE DEVICE_SOURCE_FILES *.cpp)
set (DEVICE_EXTRA_LIBRARIES
agoclient
pthread
)
set (DEVICE "PLCBUS")
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
install (PROGRAMS agoapc.py DESTINATION ${BINDIR})
install (DIRECTORY DESTINATION ${CONFDIR}/apc)
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
file (GLOB_RECURSE DEVICE_SOURCE_FILES *.cpp)
set (DEVICE_EXTRA_LIBRARIES
pthread
tinyxml2
${OpenLighting_LIBRARIES} # olaslpclient + any path
olaslpcore
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
install (PROGRAMS agojointspace.py DESTINATION ${BINDIR})
install (DIRECTORY DESTINATION ${CONFDIR}/jointspace)
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/agoping.conf DESTINATION ${CONFDIR}/conf.d)
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
install (PROGRAMS agoalert.py pushbullet.py DESTINATION ${BINDIR})
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
install (PROGRAMS agoasterisk.py DESTINATION ${BINDIR})
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
install (PROGRAMS agoaxisaudiotransmit.py DESTINATION ${BINDIR})
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
file (GLOB_RECURSE DEVICE_SOURCE_FILES *.cpp)
set (DEVICE_EXTRA_LIBRARIES
agoclient
pthread
)
set (DEVICE "agoblinkm")
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
file (GLOB_RECURSE DEVICE_SOURCE_FILES *.cpp)
set (DEVICE_EXTRA_LIBRARIES
agoclient
pthread
)
set (DEVICE "agochromoflex")
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
install (PROGRAMS agoenigma2.py DESTINATION ${BINDIR})
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
set (DEVICE_SOURCE_FILES agoenocean3.cpp esp3.cpp)
set (DEVICE_EXTRA_LIBRARIES
agoclient
pthread
)
set (DEVICE "agoenocean3")
......
#add a minimum required version
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
# only set these variables if you actually have the files
# set (my_device_schema "example.yaml")
......@@ -19,7 +19,6 @@ file (GLOB_RECURSE DEVICE_SOURCE_FILES *.cpp)
# your binary
set (DEVICE_EXTRA_LIBRARIES
agoclient
pthread
)
#set a device name. This will be the 'target'
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
file (GLOB_RECURSE DEVICE_SOURCE_FILES *.cpp)
set (DEVICE_EXTRA_LIBRARIES
agoclient
pthread
)
set (DEVICE "agofirmata")
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
install (PROGRAMS agogammu.py DESTINATION ${BINDIR})
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
install (PROGRAMS agogc100.py DESTINATION ${BINDIR})
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
file (GLOB_RECURSE DEVICE_SOURCE_FILES *.cpp)
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
file (GLOB_RECURSE DEVICE_SOURCE_FILES *.cpp)
set (DEVICE_EXTRA_LIBRARIES
agoclient
pthread
)
set (DEVICE "agoi2c")
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
install (PROGRAMS agoipx800.py pyipx800v3.py DESTINATION ${BINDIR})
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
file (GLOB_RECURSE DEVICE_SOURCE_FILES *.cpp)
set (DEVICE_EXTRA_LIBRARIES
agoclient
pthread
)
set (DEVICE "agoirtrans_ethernet")
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
file (GLOB_RECURSE DEVICE_SOURCE_FILES *.cpp)
set (DEVICE_EXTRA_LIBRARIES
${EibClient_LIBRARIES}
pthread
tinyxml2
agoclient
)
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
file (GLOB_RECURSE DEVICE_SOURCE_FILES *.cpp)
set (DEVICE_EXTRA_LIBRARIES
agoclient
pthread
)
set (DEVICE "agokwikwai")
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
# Files needed for lifxlan
# Installing local copy of lifxlan for now. CDhnages accepted by maintainer but still not available in standard package
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
include_directories("../UsageEnvironment/include")
......
......@@ -14,7 +14,6 @@ include_directories("./BasicUsageEnvironment/include")
set (DEVICE_EXTRA_LIBRARIES
agoclient
pthread
liveMedia
groupsock
BasicUsageEnvironment
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
include_directories("../groupsock/include")
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
include_directories("../UsageEnvironment/include")
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
include_directories("../UsageEnvironment/include")
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
install (PROGRAMS agomopidy.py DESTINATION ${BINDIR})
install (PROGRAMS mopidy.py DESTINATION ${BINDIR})
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
install (PROGRAMS netmetrics.py DESTINATION ${BINDIR})
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
install (PROGRAMS core.py commands.py agoiscp.py DESTINATION ${BINDIR})
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
#get files
FILE(GLOB FILES_WSDL wsdl/*.*)
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
file (GLOB_RECURSE DEVICE_SOURCE_FILES *.cpp)
set (DEVICE_EXTRA_LIBRARIES
agoclient
pthread
)
set (DEVICE "agorain8net")
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
install (PROGRAMS raspi1wGPIO.py DESTINATION ${BINDIR})
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
install (PROGRAMS raspiCamera.py DESTINATION ${BINDIR})
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
install (PROGRAMS raspiGPIO.py DESTINATION ${BINDIR})
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
install (PROGRAMS raspiMCP3xxxGPIO.py DESTINATION ${BINDIR})
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
install (PROGRAMS agorrdtool.py RRDtool.py DESTINATION ${BINDIR})
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
install (PROGRAMS agoscheduler.py DESTINATION ${BINDIR})
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
file (GLOB_RECURSE DEVICE_SOURCE_FILES *.cpp)
set (DEVICE_EXTRA_LIBRARIES
agoclient
pthread
)
set (DEVICE "agoshvt250")
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
install (PROGRAMS agosqueezebox.py pylmsserver.py pylmslibrary.py pylmsplayer.py pylmsplaylist.py DESTINATION ${BINDIR})
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
install (PROGRAMS agologger.py DESTINATION ${BINDIR})
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
install (PROGRAMS agotellstick.py DESTINATION ${BINDIR})
install (PROGRAMS tellstickbase.py DESTINATION ${BINDIR})
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
install (PROGRAMS agotemperaturnu.py DESTINATION ${BINDIR})
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
install (PROGRAMS agowake_on_lan.py pinger.py configobj.py DESTINATION ${BINDIR})
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
install (PROGRAMS agoweatherreporter.py DESTINATION ${BINDIR})
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
file (GLOB_RECURSE DEVICE_SOURCE_FILES *.cpp)
set (DEVICE_EXTRA_LIBRARIES
curl
agoclient
pthread
)
set (DEVICE "agowebcam")
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
install (PROGRAMS agox10.py DESTINATION ${BINDIR})
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
# only set these variables if you actually have the files
# set (my_device_schema "example.yaml")
......@@ -22,7 +22,6 @@ file (GLOB_RECURSE DEVICE_SOURCE_FILES
# your binary
set (DEVICE_EXTRA_LIBRARIES
agoclient
pthread
)
#set a device name. This will be the 'target'
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
file (GLOB_RECURSE DEVICE_SOURCE_FILES *.cpp
../webcam/base64.cpp)
set (DEVICE_EXTRA_LIBRARIES
pthread
curl
agoclient
)
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
file (GLOB DEVICE_SOURCE_FILES *.cpp)
set (DEVICE_EXTRA_LIBRARIES
${OpenZWave_LIBRARIES}
agoclient
pthread
)
IF (FREEBSD)
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
set_property( DIRECTORY
APPEND PROPERTY
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
IF(COMMAND cmake_policy)
cmake_policy(SET CMP0009 NEW)
......@@ -7,7 +7,6 @@ ENDIF(COMMAND cmake_policy)
set (IMPERIHOME_LIBRARIES
agoclient
agohttp
pthread
)
IF (NOT FREEBSD)
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
file (GLOB SCRIPT_FILES *.in)
......
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.0)
configure_file (
"${CMAKE_CURRENT_SOURCE_DIR}/agoclient/_directories.py.in"
......@@ -40,11 +41,11 @@ set (AGOCLIENT_LIBRARIES
qpidtypes
uuid
augeas
${Boost_SYSTEM_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
${Boost_THREAD_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY}
${JSONCPP_LIBRARIES}
${Boost_SYSTEM_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
${Boost_THREAD_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}