Changeset e5c2a9

Timestamp:

03/13/12 14:59:44 (14 months ago)

Author:

Erik Johansson <erik@…>

Branches:

('master', 'a231b56d57a69513303d0061f5fa3e3cd51c85c1')('controller-upgrade', '72b31cc86eeeef18f1371a3067b6e8a5ca21abfc')('windows_service_fixes', 'df6bd2788365991d36d5af2a75833b8de2a5860f')

Children:

104ce0fb237cdf752e06b6cebeb50e660bd0564c

Parents:

4760aa8a3272c695320214ca23b9bc78ee947f0d

git-author:

Erik Johansson <erik@ejohansson.se>2012-03-13 14:59:44+01:00

git-committer:

Erik Johansson <erik@ejohansson.se>2012-03-13 14:59:44+01:00

Message:

Store configured settings paths in header file

Location:

telldus-core/service

Files:

• CMakeLists.txt (modified) (1 diff)
• SettingsConfusePaths.h.in (added)

telldus-core/service/CMakeLists.txt

@@ -241 +241 @@
         INSTALL(TARGETS ${telldus-service_TARGET} RUNTIME DESTINATION sbin)
         SET(SYSCONF_INSTALL_DIR "/etc" CACHE PATH "The sysconfig install dir (default prefix/etc)" )
-        SET(STATE_INSTALL_DIR   "/var/state" CACHE PATH "The directory to store state information of the devices" )
-
+
+        IF (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+                SET(STATE_INSTALL_DIR "/var/spool" CACHE PATH "The directory to store state information of the devices")
+        ELSE (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+                SET(STATE_INSTALL_DIR "/var/state" CACHE PATH "The directory to store state information of the devices")
+        ENDIF (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+
+        CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/SettingsConfusePaths.h.in
+                ${CMAKE_CURRENT_BINARY_DIR}/SettingsConfusePaths.h)
+        INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+        
         INSTALL(FILES tellstick.conf
                 DESTINATION ${SYSCONF_INSTALL_DIR}