forked from microsoft/vcpkg
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request microsoft#9006 from qis/dev/qis/date
[date] Update to 2019-11-08
- Loading branch information
Showing
3 changed files
with
40 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
diff --git i/CMakeLists.txt w/CMakeLists.txt | ||
index 885e424..b9e0b43 100644 | ||
--- i/CMakeLists.txt | ||
+++ w/CMakeLists.txt | ||
@@ -72,7 +72,6 @@ target_sources( date INTERFACE | ||
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include/date/julian.h> | ||
) | ||
# public headers will get installed: | ||
-set_target_properties( date PROPERTIES PUBLIC_HEADER include/date/date.h ) | ||
target_compile_definitions( date INTERFACE | ||
#To workaround libstdc++ issue https://github.com/HowardHinnant/date/issues/388 | ||
ONLY_C_LOCALE=$<IF:$<BOOL:${COMPILE_WITH_C_LOCALE}>,1,0> | ||
@@ -112,7 +111,6 @@ if( BUILD_TZ_LIB ) | ||
endif( ) | ||
set_target_properties( tz PROPERTIES | ||
POSITION_INDEPENDENT_CODE ON | ||
- PUBLIC_HEADER "${TZ_HEADERS}" | ||
VERSION "${PROJECT_VERSION}" | ||
SOVERSION "${PROJECT_VERSION}" ) | ||
if( NOT MSVC ) | ||
@@ -136,8 +134,8 @@ write_basic_package_version_file( "${version_config}" | ||
COMPATIBILITY SameMajorVersion ) | ||
|
||
install( TARGETS date | ||
- EXPORT dateConfig | ||
- PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/date ) | ||
+ EXPORT dateConfig ) | ||
+install( FILES include/date/date.h ${TZ_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/date ) | ||
export( TARGETS date NAMESPACE date:: FILE dateConfig.cmake ) | ||
|
||
if( BUILD_TZ_LIB ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters