mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-18 04:17:51 +08:00
64 lines
2.1 KiB
Diff
64 lines
2.1 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 012512a..2cbcc21 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -73,10 +73,6 @@ target_sources( date INTERFACE
|
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include/date/iso_week.h>
|
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include/date/julian.h>
|
|
)
|
|
-if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.15)
|
|
- # public headers will get installed:
|
|
- set_target_properties( date PROPERTIES PUBLIC_HEADER include/date/date.h )
|
|
-endif ()
|
|
|
|
# These used to be set with generator expressions,
|
|
#
|
|
@@ -144,7 +140,6 @@ if( BUILD_TZ_LIB )
|
|
endif( )
|
|
set_target_properties( date-tz PROPERTIES
|
|
POSITION_INDEPENDENT_CODE ON
|
|
- PUBLIC_HEADER "${TZ_HEADERS}"
|
|
VERSION "${PROJECT_VERSION}"
|
|
SOVERSION "${ABI_VERSION}" )
|
|
if( NOT MSVC )
|
|
@@ -169,30 +164,26 @@ write_basic_package_version_file( "${version_config}"
|
|
COMPATIBILITY SameMajorVersion )
|
|
|
|
install( TARGETS date
|
|
- EXPORT dateConfig
|
|
- PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/date )
|
|
+ EXPORT dateConfig )
|
|
export( TARGETS date NAMESPACE date:: FILE dateTargets.cmake )
|
|
-if (CMAKE_VERSION VERSION_LESS 3.15)
|
|
- install(
|
|
- FILES include/date/date.h
|
|
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/date )
|
|
-endif ()
|
|
+install(
|
|
+ DIRECTORY "${CMAKE_SOURCE_DIR}/include/date"
|
|
+ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
|
|
+ PATTERN "chrono_io.h" EXCLUDE
|
|
+)
|
|
|
|
if( BUILD_TZ_LIB )
|
|
install( TARGETS date-tz
|
|
EXPORT dateConfig
|
|
- PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/date
|
|
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) # This is for Windows
|
|
export( TARGETS date-tz NAMESPACE date:: APPEND FILE dateTargets.cmake )
|
|
endif( )
|
|
|
|
-if( WIN32 AND NOT CYGWIN)
|
|
- set( CONFIG_LOC CMake )
|
|
-else( )
|
|
- set( CONFIG_LOC "${CMAKE_INSTALL_LIBDIR}/cmake/date" )
|
|
-endif( )
|
|
+
|
|
+set( CONFIG_LOC "${CMAKE_INSTALL_LIBDIR}/cmake/date" )
|
|
+
|
|
install( EXPORT dateConfig
|
|
FILE dateTargets.cmake
|
|
NAMESPACE date::
|