cppformat -> fmt

This commit is contained in:
Victor Zverovich 2016-04-24 09:06:12 -07:00
parent 5e1576f79f
commit afd67497de
22 changed files with 22 additions and 72 deletions

View File

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

View File

@ -86,7 +86,7 @@ if (FMT_PEDANTIC AND MSVC)
endif ()
if (HAVE_OPEN)
add_executable(posix-mock-test posix-mock-test.cc ../cppformat/format.cc ${TEST_MAIN_SRC})
add_executable(posix-mock-test posix-mock-test.cc ../fmt/format.cc ${TEST_MAIN_SRC})
target_include_directories(posix-mock-test PRIVATE ${PROJECT_SOURCE_DIR})
target_compile_definitions(posix-mock-test PRIVATE FMT_USE_FILE_DESCRIPTORS=1)
target_link_libraries(posix-mock-test gmock)
@ -107,14 +107,14 @@ endif ()
# Test that the library can be compiled with exceptions disabled.
check_cxx_compiler_flag(-fno-exceptions HAVE_FNO_EXCEPTIONS_FLAG)
if (HAVE_FNO_EXCEPTIONS_FLAG)
add_library(noexception-test ../cppformat/format.cc)
add_library(noexception-test ../fmt/format.cc)
target_compile_options(noexception-test PRIVATE -fno-exceptions)
endif ()
if (FMT_PEDANTIC)
# Test that the library compiles without windows.h.
if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
add_library(no-windows-h-test ../cppformat/format.cc)
add_library(no-windows-h-test ../fmt/format.cc)
target_compile_definitions(no-windows-h-test PRIVATE FMT_USE_WINDOWS_H=0)
endif ()

View File

@ -1,4 +1,4 @@
#include "cppformat/format.h"
#include "fmt/format.h"
int main(int argc, char** argv) {
for(int i = 0; i < argc; ++i)

View File

@ -25,7 +25,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "cppformat/format.h"
#include "fmt/format.h"
#include "gtest/gtest.h"
#if GTEST_HAS_DEATH_TEST

View File

@ -8,7 +8,7 @@ set(CMAKE_REQUIRED_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/../..)
function (generate_source result fragment)
set(${result} "
#define FMT_HEADER_ONLY 1
#include \"cppformat/format.h\"
#include \"fmt/format.h\"
int main() {
${fragment}
}

View File

@ -1,4 +1,4 @@
#include "cppformat/format.h"
#include "fmt/format.h"
int main(int argc, char** argv) {
for(int i = 0; i < argc; ++i)

View File

@ -29,7 +29,7 @@
#include "test-assert.h"
// Include format.cc instead of format.h to test implementation-specific stuff.
#include "cppformat/format.cc"
#include "fmt/format.cc"
#include <algorithm>
#include <cstring>

View File

@ -46,7 +46,7 @@
// Test that the library compiles if None is defined to 0 as done by xlib.h.
#define None 0
#include "cppformat/format.h"
#include "fmt/format.h"
#include "util.h"
#include "mock-allocator.h"
#include "gtest-extra.h"

View File

@ -31,14 +31,14 @@
#include <string>
#include <gtest/gtest.h>
#include "cppformat/format.h"
#include "fmt/format.h"
#ifndef FMT_USE_FILE_DESCRIPTORS
# define FMT_USE_FILE_DESCRIPTORS 0
#endif
#if FMT_USE_FILE_DESCRIPTORS
# include "cppformat/posix.h"
# include "fmt/posix.h"
#endif
#define FMT_TEST_THROW_(statement, expected_exception, expected_message, fail) \

View File

@ -1,28 +1,3 @@
/*
Header-only configuration test
// Header-only configuration test
Copyright (c) 2014, Victor Zverovich
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "cppformat/format.h"
#include "fmt/format.h"

View File

@ -1,28 +1,3 @@
/*
Additional translation unit for the header-only configuration test
// Additional translation unit for the header-only configuration test
Copyright (c) 2014, Victor Zverovich
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "cppformat/format.h"
#include "fmt/format.h"

View File

@ -29,7 +29,7 @@
#include <gtest/gtest.h>
#define FMT_USE_VARIADIC_TEMPLATES 0
#include "cppformat/format.h"
#include "fmt/format.h"
#define IDENTITY(x) x

View File

@ -29,7 +29,7 @@
#define _CRT_SECURE_NO_WARNINGS
#include "posix-mock.h"
#include "cppformat/posix.cc"
#include "fmt/posix.cc"
#include <errno.h>
#include <fcntl.h>

View File

@ -28,8 +28,8 @@
#include <cstdlib> // std::exit
#include <cstring>
#include "fmt/posix.h"
#include "gtest-extra.h"
#include "cppformat/posix.h"
#include "util.h"
#ifdef fileno

View File

@ -29,7 +29,7 @@
#include <climits>
#include <cstring>
#include "cppformat/format.h"
#include "fmt/format.h"
#include "gtest-extra.h"
#include "util.h"

View File

@ -47,7 +47,7 @@
# include <windows.h>
#endif
#include "cppformat/format.h"
#include "fmt/format.h"
#undef max

View File

@ -29,7 +29,7 @@
#include <cstdio>
#include <string>
#include "cppformat/posix.h"
#include "fmt/posix.h"
enum {BUFFER_SIZE = 256};