Improve main CMake file

Rename target date_interface to interface and tz to timezone.
Export targets date::interface and date::timezone from cmake.
This commit is contained in:
Michael Tsukerman 2019-09-06 15:57:46 +02:00 committed by Howard Hinnant
parent d21333f636
commit 3a343adf6a

View File

@ -1,6 +1,7 @@
cmake_minimum_required( VERSION 3.1.0 ) cmake_minimum_required( VERSION 3.1.0 )
project( date_prj ) project( date_prj )
set(DATE_LIBRARY_VERSION 1.0.0)
include( GNUInstallDirs ) include( GNUInstallDirs )
@ -45,30 +46,30 @@ set( HEADER_FILES
${HEADER_FOLDER}/date/tz_private.h ${HEADER_FOLDER}/date/tz_private.h
) )
add_library( tz ${HEADER_FILES} ${SOURCE_FOLDER}/tz.cpp ) add_library( timezone ${HEADER_FILES} ${SOURCE_FOLDER}/tz.cpp )
if( USE_SYSTEM_TZ_DB ) if( USE_SYSTEM_TZ_DB )
target_compile_definitions( tz PRIVATE -DUSE_AUTOLOAD=0 ) target_compile_definitions( timezone PRIVATE -DUSE_AUTOLOAD=0 )
target_compile_definitions( tz PRIVATE -DHAS_REMOTE_API=0 ) target_compile_definitions( timezone PRIVATE -DHAS_REMOTE_API=0 )
# cannot set USE_OS_TZDB to 1 on Windows # cannot set USE_OS_TZDB to 1 on Windows
if( NOT WIN32 ) if( NOT WIN32 )
target_compile_definitions( tz PUBLIC -DUSE_OS_TZDB=1 ) target_compile_definitions( timezone PUBLIC -DUSE_OS_TZDB=1 )
endif( ) endif( )
else( ) else( )
target_compile_definitions( tz PRIVATE -DUSE_AUTOLOAD=1 ) target_compile_definitions( timezone PRIVATE -DUSE_AUTOLOAD=1 )
target_compile_definitions( tz PRIVATE -DHAS_REMOTE_API=1 ) target_compile_definitions( timezone PRIVATE -DHAS_REMOTE_API=1 )
target_compile_definitions( tz PUBLIC -DUSE_OS_TZDB=0 ) target_compile_definitions( timezone PUBLIC -DUSE_OS_TZDB=0 )
find_package( CURL REQUIRED ) find_package( CURL REQUIRED )
include_directories( SYSTEM ${CURL_INCLUDE_DIRS} ) include_directories( SYSTEM ${CURL_INCLUDE_DIRS} )
set( OPTIONAL_LIBRARIES ${CURL_LIBRARIES} ) set( OPTIONAL_LIBRARIES ${CURL_LIBRARIES} )
endif( ) endif( )
if( USE_TZ_DB_IN_DOT ) if( USE_TZ_DB_IN_DOT )
target_compile_definitions( tz PRIVATE -DINSTALL=. ) target_compile_definitions( timezone PRIVATE -DINSTALL=. )
endif( ) endif( )
if( DISABLE_STRING_VIEW ) if( DISABLE_STRING_VIEW )
target_compile_definitions( tz PRIVATE -DHAS_STRING_VIEW=0 ) target_compile_definitions( timezone PRIVATE -DHAS_STRING_VIEW=0 )
endif( ) endif( )
if( BUILD_SHARED_LIBS ) if( BUILD_SHARED_LIBS )
@ -76,23 +77,24 @@ if( BUILD_SHARED_LIBS )
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC")
endif( ) endif( )
target_link_libraries( tz ${CMAKE_THREAD_LIBS_INIT} ${OPTIONAL_LIBRARIES} ) target_link_libraries( timezone ${CMAKE_THREAD_LIBS_INIT} ${OPTIONAL_LIBRARIES} )
# add include folders to the library and targets that consume it # add include folders to the library and targets that consume it
target_include_directories(tz PUBLIC target_include_directories(timezone PUBLIC
$<BUILD_INTERFACE: $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${HEADER_FOLDER}>
${CMAKE_CURRENT_SOURCE_DIR}/${HEADER_FOLDER} $<INSTALL_INTERFACE:include>
>
$<INSTALL_INTERFACE:
include
>
) )
set(version_config "${CMAKE_CURRENT_BINARY_DIR}/dateConfigVersion.cmake")
set_target_properties(timezone PROPERTIES VERSION "${DATE_LIBRARY_VERSION}" SOVERSION "${DATE_LIBRARY_VERSION}")
add_library(date_interface INTERFACE) # an interface (not a library), to enable automatic include_directory (for when just date.h, but not "tz.h and its lib" are needed) include(CMakePackageConfigHelpers)
write_basic_package_version_file("${version_config}" VERSION ${DATE_LIBRARY_VERSION} COMPATIBILITY SameMajorVersion)
add_library(interface INTERFACE) # an interface (not a library), to enable automatic include_directory (for when just date.h, but not "timezone.h and its lib" are needed)
# add include folders to the INTERFACE and targets that consume it # add include folders to the INTERFACE and targets that consume it
target_include_directories(date_interface INTERFACE target_include_directories(interface INTERFACE
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>" $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
) )
@ -102,12 +104,15 @@ else()
set(DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/date) set(DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/date)
endif() endif()
install( TARGETS date_interface EXPORT dateConfig ) install( TARGETS timezone EXPORT dateConfig
install( EXPORT dateConfig DESTINATION ${DEF_INSTALL_CMAKE_DIR} )
install( TARGETS tz
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) # This is for Windows RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) # This is for Windows
export(TARGETS interface timezone NAMESPACE date:: FILE dateConfig.cmake)
install(TARGETS interface EXPORT dateConfig)
install(EXPORT dateConfig NAMESPACE date:: DESTINATION ${DEF_INSTALL_CMAKE_DIR})
install(DIRECTORY ${HEADER_FOLDER}/ DESTINATION include/) install(DIRECTORY ${HEADER_FOLDER}/ DESTINATION include/)
if ( ENABLE_DATE_TESTING ) if ( ENABLE_DATE_TESTING )
@ -116,7 +121,7 @@ if ( ENABLE_DATE_TESTING )
add_custom_target( testit COMMAND ${CMAKE_CTEST_COMMAND} ) add_custom_target( testit COMMAND ${CMAKE_CTEST_COMMAND} )
add_dependencies( testit tz ) add_dependencies( testit timezone )
function( add_pass_tests TEST_GLOB TEST_PREFIX ) function( add_pass_tests TEST_GLOB TEST_PREFIX )
file( GLOB_RECURSE FILENAMES ${TEST_GLOB} ) file( GLOB_RECURSE FILENAMES ${TEST_GLOB} )
include_directories( "${HEADER_FOLDER}/date" ) include_directories( "${HEADER_FOLDER}/date" )
@ -130,7 +135,7 @@ if ( ENABLE_DATE_TESTING )
set( TST_NAME ${PREFIX}_test ) set( TST_NAME ${PREFIX}_test )
add_executable( ${BIN_NAME} EXCLUDE_FROM_ALL ${TEST_FILE} ) add_executable( ${BIN_NAME} EXCLUDE_FROM_ALL ${TEST_FILE} )
add_test( ${TST_NAME} ${BIN_NAME} ) add_test( ${TST_NAME} ${BIN_NAME} )
target_link_libraries( ${BIN_NAME} tz ) target_link_libraries( ${BIN_NAME} timezone )
add_dependencies( testit ${BIN_NAME} ) add_dependencies( testit ${BIN_NAME} )
endif( ) endif( )
endforeach( ) endforeach( )