zhangyiss/toml11
1
0
Fork 0
mirror of https://github.com/ToruNiina/toml11.git synced 2025-09-18 02:08:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: enable to use __cplusplus on MSVC

Browse Source 
related: https://github.com/ToruNiina/toml11/issues/112
This commit is contained in:
ToruNiina
2020-09-16 22:16:40 +09:00
parent 07ea5e52e2
commit 8c2560761b
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/main.yml vendored
View File

@@ -99,6 +99,7 @@ jobs:
- name: Configure - name: Configure
shell: cmd shell: cmd
run: | run: |
file --mime-encoding tests/test_literals.cpp
mkdir build mkdir build
cd build cd build
cmake ../ -G "NMake Makefiles" -DCMAKE_CXX_STANDARD=${{ matrix.standard }} -DBoost_ADDITIONAL_VERSIONS=1.72.0 -DBoost_USE_MULTITHREADED=ON -DBoost_ARCHITECTURE=-x64 -DBoost_NO_BOOST_CMAKE=ON -DBOOST_ROOT=%BOOST_ROOT_1_72_0% cmake ../ -G "NMake Makefiles" -DCMAKE_CXX_STANDARD=${{ matrix.standard }} -DBoost_ADDITIONAL_VERSIONS=1.72.0 -DBoost_USE_MULTITHREADED=ON -DBoost_ARCHITECTURE=-x64 -DBoost_NO_BOOST_CMAKE=ON -DBOOST_ROOT=%BOOST_ROOT_1_72_0%
@@ -109,6 +110,7 @@ jobs:
- name: Test - name: Test
working-directory: ./build working-directory: ./build
run: | run: |
./tests/test_literals --log_level=all
file --mime-encoding tests/toml/tests/example.toml file --mime-encoding tests/toml/tests/example.toml
file --mime-encoding tests/toml/tests/fruit.toml file --mime-encoding tests/toml/tests/fruit.toml
file --mime-encoding tests/toml/tests/hard_example.toml file --mime-encoding tests/toml/tests/hard_example.toml

4
CMakeLists.txt
View File

@@ -37,6 +37,10 @@ else()
endif() endif()
endif() endif()
if(MSVC)
add_definitions("/Zc:__cplusplus")
endif()
# Set some common directories # Set some common directories
include(GNUInstallDirs) include(GNUInstallDirs)
set(toml11_install_cmake_dir ${CMAKE_INSTALL_LIBDIR}/cmake/toml11) set(toml11_install_cmake_dir ${CMAKE_INSTALL_LIBDIR}/cmake/toml11)

14
tests/test_literals.cpp
View File

@@ -264,6 +264,20 @@ BOOST_AUTO_TEST_CASE(test_value_as_u8_literal)
const toml::value v4 = u8R"('''foo''')"_toml; const toml::value v4 = u8R"('''foo''')"_toml;
const toml::value v5 = u8R"("ひらがな")"_toml; const toml::value v5 = u8R"("ひらがな")"_toml;
// XXX
#ifndef __cpp_char8_t
{
const char* l = u8R"(ひらがな)";
BOOST_TEST_MESSAGE(l);
while(*l != '\0')
{
const int tmp(*l);
BOOST_TEST_MESSAGE(std::hex << tmp);
++l;
}
}
#endif
BOOST_TEST(v1.is_string()); BOOST_TEST(v1.is_string());
BOOST_TEST(v2.is_string()); BOOST_TEST(v2.is_string());
BOOST_TEST(v3.is_string()); BOOST_TEST(v3.is_string());