Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve #618 (Specify TZDB location via CMake) #623

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Resolve #618 (Specify TZDB location via CMake) #623

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72fb0d2
Resolve #618 (Specify TZDB location via CMake)
connorjak Nov 11, 2020
9b6e713
Revert change to INSTALL macro
connorjak Nov 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ option( ENABLE_DATE_TESTING "Enable unit tests" OFF )
option( DISABLE_STRING_VIEW "Disable string view" OFF )
option( COMPILE_WITH_C_LOCALE "define ONLY_C_LOCALE=1" OFF )
option( BUILD_TZ_LIB "build/install of TZ library" OFF )
# Only works when MANUAL_TZ_DB = ON
option( USE_CUSTOM_TZDB_INSTALL_PATH "Use a custom path for finding the tzdata folder" OFF )
# The location of the database is CUSTOM_TZDB_INSTALL_PATH/tzdata (CUSTOM_TZDB_INSTALL_PATH\tzdata on Windows)
set(CUSTOM_TZDB_INSTALL_PATH ".")

if( ENABLE_DATE_TESTING AND NOT BUILD_TZ_LIB )
message(WARNING "Testing requested, bug BUILD_TZ_LIB not ON - forcing the latter")
Expand All @@ -55,6 +59,10 @@ print_option( USE_TZ_DB_IN_DOT )
print_option( BUILD_SHARED_LIBS )
print_option( ENABLE_DATE_TESTING )
print_option( DISABLE_STRING_VIEW )
print_option( USE_CUSTOM_TZDB_INSTALL_PATH )
if(USE_CUSTOM_TZDB_INSTALL_PATH)
message("# date: CUSTOM_TZDB_INSTALL_PATH ${CUSTOM_TZDB_INSTALL_PATH}")
endif()

#[===================================================================[
date (header only) library
Expand Down Expand Up @@ -96,6 +104,9 @@ endif()
if ( DISABLE_STRING_VIEW )
target_compile_definitions( date INTERFACE HAS_STRING_VIEW=0 -DHAS_DEDUCTION_GUIDES=0 )
endif()
if ( USE_CUSTOM_TZDB_INSTALL_PATH )
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't be this in the

if( BUILD_TZ_LIB )

block?

I would put it in this line:

     if ( USE_SYSTEM_TZ_DB AND NOT WIN32 AND NOT MANUAL_TZ_DB )
         target_compile_definitions( date-tz PRIVATE PUBLIC USE_OS_TZDB=1 )
     else()
          target_compile_definitions( date-tz PUBLIC INSTALL=${USE_CUSTOM_TZDB_INSTALL_PATH} USE_OS_TZDB=0 )
     endif()

Se how I removed the other: INSTALL=. together with USE_OS_TZDB, that is IMHO an error, will not be considered

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh yeah, I should move it.

target_compile_definitions( date INTERFACE INSTALL=${CUSTOM_TZDB_INSTALL_PATH} )
endif()

#[===================================================================[
tz (compiled) library
Expand Down