Changeset View
Changeset View
Standalone View
Standalone View
www/domoticz/files/patch-CMakeLists.txt
--- CMakeLists.txt.orig 2018-06-23 14:18:06 UTC | --- CMakeLists.txt.orig 2020-05-24 20:28:06 UTC | ||||
+++ CMakeLists.txt | +++ CMakeLists.txt | ||||
@@ -279,7 +279,7 @@ MACRO(ADD_PRECOMPILED_HEADER _targetName _input) | @@ -524,7 +524,7 @@ IF(USE_BUILTIN_MQTT) | ||||
ENDIF(CMAKE_COMPILER_IS_GNUCXX) | option(WITH_STATIC_LIBRARIES "Build static versions of the libmosquitto/pp libraries?" ON) | ||||
ENDMACRO() | add_subdirectory (extern/mosquitto) | ||||
target_link_libraries(domoticz libmosquitto_static) | |||||
-FIND_PROGRAM(GIT_EXECUTABLE git | - INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/extern/mosquitto/lib) | ||||
+FIND_PROGRAM(GIT_EXECUTABLE NOgitNO | + INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/extern/mosquitto/lib ${CMAKE_SOURCE_DIR}/extern/mosquitto/src/deps) | ||||
DOC "git command line client") | ELSE(USE_BUILTIN_MQTT) | ||||
find_library(MQTT_LIBRARIES NAMES libmosquitto.so) | |||||
find_path(MQTT_INCLUDE_DIRS NAMES mosquitto.h) | |||||
@@ -753,7 +753,6 @@ else() | |||||
target_link_libraries(domoticz -lrt ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${MINIZIP_LIBRARIES} ${CURL_LIBRARIES} pthread ${LUA_LIBRARIES} ${MQTT_LIBRARIES} ${SQLite_LIBRARIES} ${CMAKE_DL_LIBS} ${TELLDUS_LIBRARIES} ${EXECINFO_LIBRARIES}) | |||||
ENDIF() | |||||
-ADD_PRECOMPILED_HEADER(domoticz "main/stdafx.h") | |||||
IF(CMAKE_COMPILER_IS_GNUCXX) | |||||
option(USE_STATIC_LIBSTDCXX "Build with static libgcc/libstdc++ libraries" YES) | |||||
@@ -788,7 +787,7 @@ SET(CPACK_PACKAGE_INSTALL_DIRECTORY "domoticz") | |||||
SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${domoticz}-dev") | |||||
SET(CPACK_PACKAGING_INSTALL_PREFIX "/") | |||||
-SET(CPACK_PACKAGE_DEFAULT_LOCATION "/opt/${CPACK_PACKAGE_NAME}") | |||||
+SET(CPACK_PACKAGE_DEFAULT_LOCATION "%%PREFIX%%/domoticz/${CPACK_PACKAGE_NAME}") | |||||
SET(CPACK_PACKAGE_EXECUTABLES "domoticz;Home Automation System (Domotica).") | |||||
#set(CPACK_DEB_COMPONENT_INSTALL TRUE) | |||||
@@ -797,16 +796,15 @@ SET(CPACK_DEBIAN_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR | |||||
INCLUDE(CPack) | |||||
IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) | |||||
- set(CMAKE_INSTALL_PREFIX "/opt/${CPACK_PACKAGE_NAME}" CACHE PATH "Install path prefix, prepended onto install directories." FORCE) | |||||
+ set(CMAKE_INSTALL_PREFIX "%%PREFIX%%/domoticz/${CPACK_PACKAGE_NAME}" CACHE PATH "Install path prefix, prepended onto install directories." FORCE) | |||||
ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) | |||||
-install(TARGETS domoticz DESTINATION ${CMAKE_INSTALL_PREFIX}) | |||||
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/www DESTINATION ${CMAKE_INSTALL_PREFIX}) | |||||
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/License.txt DESTINATION ${CMAKE_INSTALL_PREFIX}) | |||||
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/History.txt DESTINATION ${CMAKE_INSTALL_PREFIX}) | |||||
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/server_cert.pem DESTINATION ${CMAKE_INSTALL_PREFIX}) | |||||
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/scripts DESTINATION ${CMAKE_INSTALL_PREFIX} USE_SOURCE_PERMISSIONS) | |||||
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/plugins DESTINATION ${CMAKE_INSTALL_PREFIX}) | |||||
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Config DESTINATION ${CMAKE_INSTALL_PREFIX}) | |||||
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dzVents DESTINATION ${CMAKE_INSTALL_PREFIX}) | |||||
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/updatedomo DESTINATION ${CMAKE_INSTALL_PREFIX} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ) | |||||
+install(TARGETS domoticz DESTINATION "%%PREFIX%%/domoticz") | |||||
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/www DESTINATION "%%PREFIX%%/domoticz") | |||||
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/License.txt DESTINATION "%%PREFIX%%/domoticz") | |||||
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/History.txt DESTINATION "%%PREFIX%%/domoticz") | |||||
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/server_cert.pem DESTINATION "%%PREFIX%%/domoticz") | |||||
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/scripts DESTINATION "%%PREFIX%%/domoticz" USE_SOURCE_PERMISSIONS) | |||||
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/plugins DESTINATION "%%PREFIX%%/domoticz") | |||||
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Config DESTINATION "%%PREFIX%%/domoticz") | |||||
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dzVents DESTINATION "%%PREFIX%%/domoticz") |