summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllen Winter <allen.winter@kdab.com>2020-10-31 16:57:20 -0400
committerAllen Winter <allen.winter@kdab.com>2020-10-31 16:57:20 -0400
commit555a7d3e620c48acd625218ada565ea4b5eee921 (patch)
tree2e72e29e8f0f822977381f9884464895914a2039
parent96ce4bd250e1c6a26f8e00e233b000abd81a59e2 (diff)
parent72655371c4e1d48bfdefa61b0a0de3d62cb3149b (diff)
downloadlibical-git-555a7d3e620c48acd625218ada565ea4b5eee921.tar.gz
Merge branch '3.0'
-rw-r--r--CMakeLists.txt12
1 files changed, 8 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b76e669..8c5dae9e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -299,7 +299,8 @@ if(WIN32 OR WINCE)
else()
set(DEF_USE_BUILTIN_TZDATA True)
endif()
-libical_option(USE_BUILTIN_TZDATA "Build using our builtin timezone data, else use the system timezone data. ALWAYS true on Windows." ${DEF_USE_BUILTIN_TZDATA})
+libical_option(USE_BUILTIN_TZDATA "(Careful) Build using libical's built-in timezone data, else use the system timezone data on non-Windows systems. ALWAYS true on Windows. Non-Windows users should know what they're doing if they choose not to use system provided timezone data. The libical project does not guarantee that the built-in timezone data is up-to-date." ${DEF_USE_BUILTIN_TZDATA})
+mark_as_advanced(USE_BUILTIN_TZDATA)
if(USE_BUILTIN_TZDATA)
set(USE_BUILTIN_TZDATA 1)
else()
@@ -451,7 +452,8 @@ if(SIZEOF_TIME_T EQUAL 4)
endif()
################ Developer Options #####################
-libical_option(ABI_DUMPER "Build for abi-dumper (developer-only option)." False)
+libical_option(ABI_DUMPER "(Developer-only) Build for abi-dumper." False)
+mark_as_advanced(ABI_DUMPER)
if(ABI_DUMPER)
if(CMAKE_COMPILER_IS_GNUCC)
set(CMAKE_C_FLAGS "-g -Og")
@@ -462,7 +464,8 @@ if(ABI_DUMPER)
endif()
endif()
-libical_option(ADDRESS_SANITIZER "Build with the address sanitizer (developer-only option)." False)
+libical_option(ADDRESS_SANITIZER "(Developer-only) Build with the address sanitizer." False)
+mark_as_advanced(ADDRESS_SANITIZER)
if(ADDRESS_SANITIZER)
if(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -g")
@@ -487,7 +490,8 @@ if(ADDRESS_SANITIZER)
endif()
endif()
-libical_option(THREAD_SANITIZER "Build with the thread sanitizer (developer-only option)." False)
+libical_option(THREAD_SANITIZER "(Developer-only) Build with the thread sanitizer." False)
+mark_as_advanced(THREAD_SANITIZER)
if(THREAD_SANITIZER)
if(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=thread -O1 -g")