# HG changeset patch # User Myhailo Danylenko # Date 1337629340 -10800 # Node ID 9151fef57135648e7c03b53568465398b99fbc11 # Parent 9a6164bc805c70a872ae92b6a29e672adb86e1a8 Fix option types in cmakelists diff -r 9a6164bc805c -r 9151fef57135 CMakeLists.txt --- a/CMakeLists.txt Mon May 21 19:26:16 2012 +0300 +++ b/CMakeLists.txt Mon May 21 22:42:20 2012 +0300 @@ -28,12 +28,12 @@ option(DEBUG "Enable debugging symbols" OFF) foreach(HANDLER IN LISTS HANDLER_LIST) string(TOUPPER ${HANDLER} UPHANDLER) - set(HOOK_${UPHANDLER}_IN "${HANDLER}-in" CACHE TEXT "${HANDLER} incoming event hook name") - set(HOOK_${UPHANDLER}_OUT "${HANDLER}-out" CACHE TEXT "${HANDLER} outgoing event hook name") + set(HOOK_${UPHANDLER}_IN "${HANDLER}-in" CACHE STRING "${HANDLER} incoming event hook name") + set(HOOK_${UPHANDLER}_OUT "${HANDLER}-out" CACHE STRING "${HANDLER} outgoing event hook name") endforeach(HANDLER) -set(OPT_TUNE_PAUSE_IS_STOP "pep_tune_pause_is_stop" CACHE TEXT "Tune pause is stop option name") -set(OPT_TUNE_INTERVAL "pep_tune_interval" CACHE TEXT "Tune intevral option name") -set(OPT_GEOLOC_INTERVAL "pep_geoloc_interval" CACHE TEXT "Geoloc interval option name") +set(OPT_TUNE_PAUSE_IS_STOP "pep_tune_pause_is_stop" CACHE STRING "Tune pause is stop option name") +set(OPT_TUNE_INTERVAL "pep_tune_interval" CACHE STRING "Tune intevral option name") +set(OPT_GEOLOC_INTERVAL "pep_geoloc_interval" CACHE STRING "Geoloc interval option name") set(PEP_DESCRIPTION "Common listener for PEP events") set(PEP_MOOD_DESCRIPTION "PEP mood event handler") @@ -98,13 +98,13 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "PEP modules") set(CPACK_RESOURCE_FILE_LICENSE ${pep_SOURCE_DIR}/COPYING) set(CPACK_SOURCE_GENERATOR TBZ2) -set(CPACK_GENERATOR DEB CACHE TEXT "Binary package generator, eg DEB, RPM, TGZ, NSIS...") +set(CPACK_GENERATOR DEB CACHE STRING "Binary package generator, eg DEB, RPM, TGZ, NSIS...") set(CPACK_DEBIAN_PACKAGE_SECTION libs) find_program(DPKG_EXECUTABLE dpkg) if(DPKG_EXECUTABLE) execute_process(COMMAND ${DPKG_EXECUTABLE} --print-architecture OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE) else() - set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE i386 CACHE TEXT "Architecture of package") + set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE i386 CACHE STRING "Architecture of package") endif() set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}") set(CPACK_SOURCE_IGNORE_FILES "/\\\\..*;\\\\.swp;~$;/build/;\\\\.tar\\\\.;\\\\.deb;\\\\.so")