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.

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.
e575acd1 · Johan Ström · 8077f115 · e575acd1 · e575acd1 · e575acd1
Commit e575acd1 authored Mar 27, 2018 by Johan Ström
82 changed files
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-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})


--- a/conf/CMakeLists.txt
+++ b/conf/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 file (GLOB INIT_FILES *.in)


--- a/conf/conf.d/CMakeLists.txt
+++ b/conf/conf.d/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 file (GLOB CONFD_FILES *.in)


--- a/conf/schema.d/CMakeLists.txt
+++ b/conf/schema.d/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 file (GLOB SCHEMA_FILES *.yaml)


--- a/conf/systemd/CMakeLists.txt
+++ b/conf/systemd/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 file (GLOB SYSTEMD_FILES *.in)


--- a/conf/sysvinit/CMakeLists.txt
+++ b/conf/sysvinit/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 file (GLOB SYSV_FILES *.in)


--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
-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

--- a/core/datalogger/CMakeLists.txt
+++ b/core/datalogger/CMakeLists.txt
-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
 )

--- a/core/drain/CMakeLists.txt
+++ b/core/drain/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 set (DRAIN_LIBRARIES
    agoclient
-    pthread
 )

 # add the executable

--- a/core/event/CMakeLists.txt
+++ b/core/event/CMakeLists.txt
-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

--- a/core/lua/CMakeLists.txt
+++ b/core/lua/CMakeLists.txt
-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

--- a/core/messagesend/CMakeLists.txt
+++ b/core/messagesend/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 set (MESSAGESEND_LIBRARIES
    agoclient

--- a/core/resolver/CMakeLists.txt
+++ b/core/resolver/CMakeLists.txt
-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)

--- a/core/rpc/CMakeLists.txt
+++ b/core/rpc/CMakeLists.txt
-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
 )


--- a/core/scenario/CMakeLists.txt
+++ b/core/scenario/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 set (SCENARIO_LIBRARIES
    agoclient
-    pthread
 )

 # add the executable

--- a/core/scheduler/CMakeLists.txt
+++ b/core/scheduler/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 install (PROGRAMS agoscheduler.py DESTINATION ${BINDIR})
 install (PROGRAMS scheduler.py DESTINATION ${BINDIR})

--- a/core/security/CMakeLists.txt
+++ b/core/security/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 set (SECURITY_LIBRARIES
    agoclient
-    pthread
 )

 # add the executable

--- a/core/system/CMakeLists.txt
+++ b/core/system/CMakeLists.txt
-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}
 )


--- a/core/timer/CMakeLists.txt
+++ b/core/timer/CMakeLists.txt
-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

--- a/devices/1wire/CMakeLists.txt
+++ b/devices/1wire/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 install (PROGRAMS agoowfs.py DESTINATION ${BINDIR})
 install (DIRECTORY DESTINATION ${CONFDIR}/owfs)
--- a/devices/CMakeLists.txt
+++ b/devices/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 set (AGODEVICES
  shvt250

--- a/devices/ETAtouch/CMakeLists.txt
+++ b/devices/ETAtouch/CMakeLists.txt
-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")

--- a/devices/MQTT/CMakeLists.txt
+++ b/devices/MQTT/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 install (PROGRAMS agomqtt.py DESTINATION ${BINDIR})
 install (PROGRAMS agomqttpahoclient.py DESTINATION ${BINDIR})
--- a/devices/MySensors/CMakeLists.txt
+++ b/devices/MySensors/CMakeLists.txt
-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")

--- a/devices/NVR/CMakeLists.txt
+++ b/devices/NVR/CMakeLists.txt
-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

--- a/devices/PLCBUS/CMakeLists.txt
+++ b/devices/PLCBUS/CMakeLists.txt
-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")

--- a/devices/agoapc/CMakeLists.txt
+++ b/devices/agoapc/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 install (PROGRAMS agoapc.py DESTINATION ${BINDIR})
 install (DIRECTORY DESTINATION ${CONFDIR}/apc)
--- a/devices/agodmx/CMakeLists.txt
+++ b/devices/agodmx/CMakeLists.txt
-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

--- a/devices/agojointspace/CMakeLists.txt
+++ b/devices/agojointspace/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 install (PROGRAMS agojointspace.py DESTINATION ${BINDIR})
 install (DIRECTORY DESTINATION ${CONFDIR}/jointspace)
--- a/devices/agoping/CMakeLists.txt
+++ b/devices/agoping/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/agoping.conf DESTINATION ${CONFDIR}/conf.d)
--- a/devices/alert/CMakeLists.txt
+++ b/devices/alert/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 install (PROGRAMS agoalert.py pushbullet.py DESTINATION ${BINDIR})
--- a/devices/asterisk/CMakeLists.txt
+++ b/devices/asterisk/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 install (PROGRAMS agoasterisk.py DESTINATION ${BINDIR})
--- a/devices/axisaudiotransmit/CMakeLists.txt
+++ b/devices/axisaudiotransmit/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 install (PROGRAMS agoaxisaudiotransmit.py DESTINATION ${BINDIR})
--- a/devices/blinkm/CMakeLists.txt
+++ b/devices/blinkm/CMakeLists.txt
-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")

--- a/devices/chromoflex/CMakeLists.txt
+++ b/devices/chromoflex/CMakeLists.txt
-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")

--- a/devices/enigma2/CMakeLists.txt
+++ b/devices/enigma2/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 install (PROGRAMS agoenigma2.py DESTINATION ${BINDIR})
--- a/devices/enocean3/CMakeLists.txt
+++ b/devices/enocean3/CMakeLists.txt
-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")

--- a/devices/example/CMakeLists.txt
+++ b/devices/example/CMakeLists.txt
 #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'

--- a/devices/firmata/CMakeLists.txt
+++ b/devices/firmata/CMakeLists.txt
-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")

--- a/devices/gammu/CMakeLists.txt
+++ b/devices/gammu/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 install (PROGRAMS agogammu.py DESTINATION ${BINDIR})
--- a/devices/gc100/CMakeLists.txt
+++ b/devices/gc100/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 install (PROGRAMS agogc100.py DESTINATION ${BINDIR})
--- a/devices/harmonyhub/CMakeLists.txt
+++ b/devices/harmonyhub/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 file (GLOB_RECURSE DEVICE_SOURCE_FILES *.cpp)


--- a/devices/i2c/CMakeLists.txt
+++ b/devices/i2c/CMakeLists.txt
-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")

--- a/devices/ipx800/CMakeLists.txt
+++ b/devices/ipx800/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 install (PROGRAMS agoipx800.py pyipx800v3.py DESTINATION ${BINDIR})
--- a/devices/irtrans_ethernet/CMakeLists.txt
+++ b/devices/irtrans_ethernet/CMakeLists.txt
-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")

--- a/devices/knx/CMakeLists.txt
+++ b/devices/knx/CMakeLists.txt
-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
 )

--- a/devices/kwikwai/CMakeLists.txt
+++ b/devices/kwikwai/CMakeLists.txt
-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")

--- a/devices/lifx/CMakeLists.txt
+++ b/devices/lifx/CMakeLists.txt
-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

--- a/devices/mediaproxy/BasicUsageEnvironment/CMakeLists.txt
+++ b/devices/mediaproxy/BasicUsageEnvironment/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)


 include_directories("../UsageEnvironment/include")

--- a/devices/mediaproxy/CMakeLists.txt
+++ b/devices/mediaproxy/CMakeLists.txt
@@ -14,7 +14,6 @@ include_directories("./BasicUsageEnvironment/include")

 set (DEVICE_EXTRA_LIBRARIES
    agoclient
-    pthread
    liveMedia
    groupsock
    BasicUsageEnvironment

--- a/devices/mediaproxy/UsageEnvironment/CMakeLists.txt
+++ b/devices/mediaproxy/UsageEnvironment/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)


 include_directories("../groupsock/include")

--- a/devices/mediaproxy/groupsock/CMakeLists.txt
+++ b/devices/mediaproxy/groupsock/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)


 include_directories("../UsageEnvironment/include")

--- a/devices/mediaproxy/liveMedia/CMakeLists.txt
+++ b/devices/mediaproxy/liveMedia/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)


 include_directories("../UsageEnvironment/include")

--- a/devices/mopidy/CMakeLists.txt
+++ b/devices/mopidy/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 install (PROGRAMS agomopidy.py DESTINATION ${BINDIR})
 install (PROGRAMS mopidy.py DESTINATION ${BINDIR})
--- a/devices/netmetrics/CMakeLists.txt
+++ b/devices/netmetrics/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 install (PROGRAMS netmetrics.py DESTINATION ${BINDIR})
--- a/devices/onkyo/CMakeLists.txt
+++ b/devices/onkyo/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 install (PROGRAMS core.py commands.py agoiscp.py DESTINATION ${BINDIR})
--- a/devices/onvif/CMakeLists.txt
+++ b/devices/onvif/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 #get files
 FILE(GLOB FILES_WSDL wsdl/*.*)

--- a/devices/rain8net/CMakeLists.txt
+++ b/devices/rain8net/CMakeLists.txt
-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")

--- a/devices/raspi1wGPIO/CMakeLists.txt
+++ b/devices/raspi1wGPIO/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 install (PROGRAMS raspi1wGPIO.py DESTINATION ${BINDIR})
--- a/devices/raspiCamera/CMakeLists.txt
+++ b/devices/raspiCamera/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 install (PROGRAMS raspiCamera.py DESTINATION ${BINDIR})
--- a/devices/raspiGPIO/CMakeLists.txt
+++ b/devices/raspiGPIO/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 install (PROGRAMS raspiGPIO.py DESTINATION ${BINDIR})
--- a/devices/raspiMCP3xxxGPIO/CMakeLists.txt
+++ b/devices/raspiMCP3xxxGPIO/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 install (PROGRAMS raspiMCP3xxxGPIO.py DESTINATION ${BINDIR})
--- a/devices/rrdtool/CMakeLists.txt
+++ b/devices/rrdtool/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 install (PROGRAMS agorrdtool.py RRDtool.py DESTINATION ${BINDIR})
--- a/devices/scheduler/CMakeLists.txt
+++ b/devices/scheduler/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 install (PROGRAMS agoscheduler.py DESTINATION ${BINDIR})
--- a/devices/shvt250/CMakeLists.txt
+++ b/devices/shvt250/CMakeLists.txt
-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")

--- a/devices/squeezebox/CMakeLists.txt
+++ b/devices/squeezebox/CMakeLists.txt
-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})
--- a/devices/syslog/CMakeLists.txt
+++ b/devices/syslog/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 install (PROGRAMS agologger.py DESTINATION ${BINDIR})
--- a/devices/tellstick/CMakeLists.txt
+++ b/devices/tellstick/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 install (PROGRAMS agotellstick.py DESTINATION ${BINDIR})
 install (PROGRAMS tellstickbase.py DESTINATION ${BINDIR})

--- a/devices/temperatur.nu/CMakeLists.txt
+++ b/devices/temperatur.nu/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 install (PROGRAMS agotemperaturnu.py DESTINATION ${BINDIR})
--- a/devices/wake_on_lan/CMakeLists.txt
+++ b/devices/wake_on_lan/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 install (PROGRAMS agowake_on_lan.py pinger.py configobj.py DESTINATION ${BINDIR})
--- a/devices/weatherreporter/CMakeLists.txt
+++ b/devices/weatherreporter/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 install (PROGRAMS agoweatherreporter.py DESTINATION ${BINDIR})


--- a/devices/webcam/CMakeLists.txt
+++ b/devices/webcam/CMakeLists.txt
-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")

--- a/devices/x10/CMakeLists.txt
+++ b/devices/x10/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 install (PROGRAMS agox10.py DESTINATION ${BINDIR})
--- a/devices/yamaha/CMakeLists.txt
+++ b/devices/yamaha/CMakeLists.txt
-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'

--- a/devices/zmcam/CMakeLists.txt
+++ b/devices/zmcam/CMakeLists.txt
-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
 )

--- a/devices/zwave/CMakeLists.txt
+++ b/devices/zwave/CMakeLists.txt
-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)

--- a/gateways/CMakeLists.txt
+++ b/gateways/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 set_property( DIRECTORY
 	APPEND PROPERTY

--- a/gateways/ImperiHome/CMakeLists.txt
+++ b/gateways/ImperiHome/CMakeLists.txt
-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)

--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)

 file (GLOB SCRIPT_FILES *.in)


--- a/shared/CMakeLists.txt
+++ b/shared/CMakeLists.txt
-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}