diff --git a/src/token.h b/src/token.h index 9c9a5b7..be07ce3 100644 --- a/src/token.h +++ b/src/token.h @@ -13,7 +13,7 @@ #include namespace YAML { -const std::string TokenNames[] = { +constexpr char const* TokenNames[] = { "DIRECTIVE", "DOC_START", "DOC_END", "BLOCK_SEQ_START", "BLOCK_MAP_START", "BLOCK_SEQ_END", "BLOCK_MAP_END", "BLOCK_ENTRY", "FLOW_SEQ_START", "FLOW_MAP_START", "FLOW_SEQ_END", "FLOW_MAP_END", diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 23fc0c5..6862797 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -6,7 +6,9 @@ set(CMAKE_POLICY_DEFAULT_CMP0048 NEW) add_subdirectory( "${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.8.0" - "${CMAKE_CURRENT_BINARY_DIR}/prefix") + "${CMAKE_CURRENT_BINARY_DIR}/prefix" + EXCLUDE_FROM_ALL + ) include_directories(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.8.0/googletest/include")