mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2025-02-05 00:40:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move headers to include/fmt

Browse Source
This commit is contained in:
Victor Zverovich 2017-10-21 07:38:49 -07:00
parent 3d11eac784
commit 170f5c671f
14 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -72,7 +72,7 @@ else ()
check_symbol_exists(open fcntl.h HAVE_OPEN) check_symbol_exists(open fcntl.h HAVE_OPEN)
endif () endif ()
add_subdirectory(fmt) add_subdirectory(include/fmt)
if (FMT_DOC) if (FMT_DOC)
add_subdirectory(doc) add_subdirectory(doc)

7
fmt/CMakeLists.txt → include/fmt/CMakeLists.txt
View File

@ -7,7 +7,8 @@ if (HAVE_OPEN)
set(FMT_SOURCES ${FMT_SOURCES} posix.cc) set(FMT_SOURCES ${FMT_SOURCES} posix.cc)
endif () endif ()
add_library(fmt ${FMT_SOURCES} ${FMT_HEADERS} ../README.rst ../ChangeLog.rst) add_library(fmt
${FMT_SOURCES} ${FMT_HEADERS} ../../README.rst ../../ChangeLog.rst)
option(FMT_CPPFORMAT "Build cppformat library for backward compatibility." OFF) option(FMT_CPPFORMAT "Build cppformat library for backward compatibility." OFF)
if (FMT_CPPFORMAT) if (FMT_CPPFORMAT)
@ -22,7 +23,7 @@ if (FMT_PEDANTIC)
endif () endif ()
target_include_directories(fmt PUBLIC target_include_directories(fmt PUBLIC
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}> $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>) $<INSTALL_INTERFACE:include>)
set_target_properties(fmt PROPERTIES set_target_properties(fmt PROPERTIES
@ -45,7 +46,7 @@ if (CMAKE_VERSION VERSION_GREATER 3.1.0 OR CMAKE_VERSION VERSION_EQUAL 3.1.0)
target_compile_definitions(fmt-header-only INTERFACE FMT_HEADER_ONLY=1) target_compile_definitions(fmt-header-only INTERFACE FMT_HEADER_ONLY=1)
target_include_directories(fmt-header-only INTERFACE target_include_directories(fmt-header-only INTERFACE
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}> $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>) $<INSTALL_INTERFACE:include>)
endif () endif ()

0
fmt/format.cc → include/fmt/format.cc
View File

0
fmt/format.h → include/fmt/format.h
View File

0
fmt/ostream.cc → include/fmt/ostream.cc
View File

0
fmt/ostream.h → include/fmt/ostream.h
View File

0
fmt/posix.cc → include/fmt/posix.cc
View File

0
fmt/posix.h → include/fmt/posix.h
View File

0
fmt/printf.cc → include/fmt/printf.cc
View File

0
fmt/printf.h → include/fmt/printf.h
View File

0
fmt/string.h → include/fmt/string.h
View File

0
fmt/time.h → include/fmt/time.h
View File

0
fmt/write.h → include/fmt/write.h
View File

18
test/CMakeLists.txt
View File

@ -98,8 +98,9 @@ endif ()
if (HAVE_OPEN) if (HAVE_OPEN)
add_fmt_executable(posix-mock-test add_fmt_executable(posix-mock-test
posix-mock-test.cc ../fmt/format.cc ${TEST_MAIN_SRC}) posix-mock-test.cc ../include/fmt/format.cc ${TEST_MAIN_SRC})
target_include_directories(posix-mock-test PRIVATE ${PROJECT_SOURCE_DIR}) target_include_directories(
posix-mock-test PRIVATE ${PROJECT_SOURCE_DIR}/include)
target_compile_definitions(posix-mock-test PRIVATE FMT_USE_FILE_DESCRIPTORS=1) target_compile_definitions(posix-mock-test PRIVATE FMT_USE_FILE_DESCRIPTORS=1)
target_link_libraries(posix-mock-test gmock) target_link_libraries(posix-mock-test gmock)
add_test(NAME posix-mock-test COMMAND posix-mock-test) add_test(NAME posix-mock-test COMMAND posix-mock-test)
@ -112,25 +113,28 @@ target_link_libraries(header-only-test gmock)
if (TARGET fmt-header-only) if (TARGET fmt-header-only)
target_link_libraries(header-only-test fmt-header-only) target_link_libraries(header-only-test fmt-header-only)
else () else ()
target_include_directories(header-only-test PRIVATE ${PROJECT_SOURCE_DIR}) target_include_directories(
header-only-test PRIVATE ${PROJECT_SOURCE_DIR}/include)
target_compile_definitions(header-only-test PRIVATE FMT_HEADER_ONLY=1) target_compile_definitions(header-only-test PRIVATE FMT_HEADER_ONLY=1)
endif () endif ()
# Test that the library can be compiled with exceptions disabled. # Test that the library can be compiled with exceptions disabled.
check_cxx_compiler_flag(-fno-exceptions HAVE_FNO_EXCEPTIONS_FLAG) check_cxx_compiler_flag(-fno-exceptions HAVE_FNO_EXCEPTIONS_FLAG)
if (HAVE_FNO_EXCEPTIONS_FLAG) if (HAVE_FNO_EXCEPTIONS_FLAG)
add_library(noexception-test ../fmt/format.cc) add_library(noexception-test ../include/fmt/format.cc)
target_compile_options(noexception-test PUBLIC ${CPP14_FLAG}) target_compile_options(noexception-test PUBLIC ${CPP14_FLAG})
target_include_directories(noexception-test PRIVATE ${PROJECT_SOURCE_DIR}) target_include_directories(
noexception-test PRIVATE ${PROJECT_SOURCE_DIR}/include)
target_compile_options(noexception-test PRIVATE -fno-exceptions) target_compile_options(noexception-test PRIVATE -fno-exceptions)
endif () endif ()
if (FMT_PEDANTIC) if (FMT_PEDANTIC)
# Test that the library compiles without windows.h. # Test that the library compiles without windows.h.
if (CMAKE_SYSTEM_NAME STREQUAL "Windows") if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
add_library(no-windows-h-test ../fmt/format.cc) add_library(no-windows-h-test ../include/fmt/format.cc)
target_compile_options(no-windows-h-test PUBLIC ${CPP14_FLAG}) target_compile_options(no-windows-h-test PUBLIC ${CPP14_FLAG})
target_include_directories(no-windows-h-test PRIVATE ${PROJECT_SOURCE_DIR}) target_include_directories(
no-windows-h-test PRIVATE ${PROJECT_SOURCE_DIR}/include)
target_compile_definitions(no-windows-h-test PRIVATE FMT_USE_WINDOWS_H=0) target_compile_definitions(no-windows-h-test PRIVATE FMT_USE_WINDOWS_H=0)
endif () endif ()