11CMAKE_MINIMUM_REQUIRED ( VERSION 3.10 )
22PROJECT ( cppcore )
3- SET ( CPPCORE_VERSION_MAJOR 0 )
4- SET ( CPPCORE_VERSION_MINOR 1 )
5- SET ( CPPCORE_VERSION_PATCH 0 )
6- SET ( CPPCORE_VERSION ${CPPCORE_VERSION_MAJOR} .${CPPCORE_VERSION_MINOR} .${CPPCORE_VERSION_PATCH} )
7- SET ( PROJECT_VERSION "${CPPCORE_VERSION} " )
3+ SET ( CPPCORE_VERSION_MAJOR 0 )
4+ SET ( CPPCORE_VERSION_MINOR 1 )
5+ SET ( CPPCORE_VERSION_PATCH 0 )
6+ SET ( CPPCORE_VERSION ${CPPCORE_VERSION_MAJOR} .${CPPCORE_VERSION_MINOR} .${CPPCORE_VERSION_PATCH} )
7+ SET ( PROJECT_VERSION "${CPPCORE_VERSION} " )
88
99find_package (GTest)
1010
@@ -17,11 +17,11 @@ option( CPPCORE_BUILD_UNITTESTS
1717 "Build unit tests."
1818 ON
1919)
20- option ( CPPCORE_ASAN
20+ option (CPPCORE_ASAN
2121 "Enable AddressSanitizer."
2222 OFF
2323)
24- option ( CPPCORE_UBSAN
24+ option (CPPCORE_UBSAN
2525 "Enable Undefined Behavior sanitizer."
2626 OFF
2727)
@@ -38,9 +38,9 @@ link_directories(
3838 ${CMAKE_HOME_DIRECTORY} /
3939)
4040
41- SET ( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY} /lib )
42- SET ( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY} /lib )
43- SET ( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY} /bin )
41+ SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY} /lib )
42+ SET (CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY} /lib )
43+ SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY} /bin )
4444
4545if ( WIN32 AND NOT CYGWIN )
4646 set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc" ) # Force to always compile with W4
@@ -56,38 +56,39 @@ elseif ( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
5656 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -g -pedantic -std=c++11" )
5757endif ()
5858
59- IF (ASSIMP_ASAN )
59+ IF (CPPCORE_ASAN )
6060 MESSAGE (STATUS "AddressSanitizer enabled" )
6161 SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address" )
6262 SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address" )
6363ENDIF ()
6464
65- IF (ASSIMP_UBSAN )
65+ IF (CPPCORE_UBSAN )
6666 MESSAGE (STATUS "Undefined Behavior sanitizer enabled" )
67- SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined -fno-sanitize-recover=all" )
68- SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=undefined -fno-sanitize-recover=all" )
67+ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined -fno-sanitize-recover=all" )
68+ SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=undefined -fno-sanitize-recover=all" )
6969ENDIF ()
7070
71- SET ( cppcore_src
71+ SET ( cppcore_src
7272 code/cppcore.cpp
7373 include /cppcore/CPPCoreCommon.h
7474)
7575
76- SET ( cppcore_common_src
76+ SET ( cppcore_common_src
7777 include /cppcore/Common/Hash.h
7878 include /cppcore/Common/TStringBase.h
79+ include /cppcore/Common/TStringView.h
7980 include /cppcore/Common/Variant.h
8081 include /cppcore/Common/Sort .h
8182 include /cppcore/Common/TBitField.h
8283 include /cppcore/Common/TOptional.h
8384)
8485
85- SET ( cppcore_random_src
86+ SET (cppcore_random_src
8687 include /cppcore/Random/RandomGenerator.h
8788 code/Random/RandomGenerator.cpp
8889)
8990
90- SET ( cppcore_container_src
91+ SET ( cppcore_container_src
9192 include /cppcore/Container/THashMap.h
9293 include /cppcore/Container/TArray.h
9394 include /cppcore/Container/TStaticArray.h
@@ -96,7 +97,7 @@ SET ( cppcore_container_src
9697 include /cppcore/Container/TStaticArray.h
9798)
9899
99- SET ( cppcore_memory_src
100+ SET ( cppcore_memory_src
100101 include /cppcore/Memory/MemUtils.h
101102 include /cppcore/Memory/TDefaultAllocator.h
102103 include /cppcore/Memory/TStackAllocator.h
@@ -137,6 +138,8 @@ IF( CPPCORE_BUILD_UNITTESTS )
137138 test /common/SortTest.cpp
138139 test /common/TBitFieldTest.cpp
139140 test /common/TOptionalTest.cpp
141+ test /common/TStringViewTest.cpp
142+ test /common/TStringBaseTest.cpp
140143 )
141144
142145 SET ( cppcore_container_test_src
0 commit comments