Replace underscore with dash in unit name

Replace CMake option prefix to STRING_VIEW_LITE_OPT_ (was: STRINGVIEW_LITE_OPT_)

Author: martinmoene

.travis.yml

@@ -156,6 +156,6 @@ script:
   - export CXX=${COMPILER}
   - JOBS=2 # Travis machines have 2 cores.
   - mkdir build && cd build
-  - cmake -G "Unix Makefiles" -DSTRINGVIEW_LITE_OPT_SELECT_NONSTD=ON -DSTRINGVIEW_LITE_OPT_BUILD_TESTS=ON -DSTRINGVIEW_LITE_OPT_BUILD_EXAMPLES=OFF ..
+  - cmake -G "Unix Makefiles" -DSTRING_VIEW_LITE_OPT_SELECT_NONSTD=ON -DSTRING_VIEW_LITE_OPT_BUILD_TESTS=ON -DSTRING_VIEW_LITE_OPT_BUILD_EXAMPLES=OFF ..
   - cmake --build . -- -j${JOBS}
   - ctest --output-on-failure -j${JOBS}

CMakeLists.txt

@@ -18,7 +18,7 @@ project(
 
 # Package information:
 
-set( unit_name       "string_view" )
+set( unit_name       "string-view" )
 set( package_nspace  "nonstd" )
 set( package_name    "${unit_name}-lite" )
 set( package_version "${${PROJECT_NAME}_VERSION}" )
@@ -35,23 +35,23 @@ endif()
 
 # If toplevel project, enable building and performing of tests, disable building of examples:
 
-option( STRINGVIEW_LITE_OPT_BUILD_TESTS     "Build and perform string-view-lite tests" ${string_view_IS_TOPLEVEL_PROJECT} )
-option( STRINGVIEW_LITE_OPT_BUILD_EXAMPLES  "Build string-view-lite examples" OFF )
+option( STRING_VIEW_LITE_OPT_BUILD_TESTS     "Build and perform string-view-lite tests" ${string_view_IS_TOPLEVEL_PROJECT} )
+option( STRING_VIEW_LITE_OPT_BUILD_EXAMPLES  "Build string-view-lite examples" OFF )
 
-option( STRINGVIEW_LITE_OPT_SELECT_STD      "Select std::string_view"    OFF )
-option( STRINGVIEW_LITE_OPT_SELECT_NONSTD   "Select nonstd::string_view" OFF )
+option( STRING_VIEW_LITE_OPT_SELECT_STD      "Select std::string_view"    OFF )
+option( STRING_VIEW_LITE_OPT_SELECT_NONSTD   "Select nonstd::string_view" OFF )
 
-option( STRINGVIEW_LITE_OPT_CONV_STD_STRING_CLASS_METHODS  "Provide conversion to/from std::string (class methods)"  ON )
-option( STRINGVIEW_LITE_OPT_CONV_STD_STRING_FREE_FUNCTIONS "Provide conversion to/from std::string (free functions)" ON )
+option( STRING_VIEW_LITE_OPT_CONV_STD_STRING_CLASS_METHODS  "Provide conversion to/from std::string (class methods)"  ON )
+option( STRING_VIEW_LITE_OPT_CONV_STD_STRING_FREE_FUNCTIONS "Provide conversion to/from std::string (free functions)" ON )
 
 # If requested, build and perform tests, build examples:
 
-if ( STRINGVIEW_LITE_OPT_BUILD_TESTS )
+if ( STRING_VIEW_LITE_OPT_BUILD_TESTS )
     enable_testing()
     add_subdirectory( test )
 endif()
 
-if ( STRINGVIEW_LITE_OPT_BUILD_EXAMPLES )
+if ( STRING_VIEW_LITE_OPT_BUILD_EXAMPLES )
     enable_testing()
     add_subdirectory( example )
 endif()

appveyor.yml

@@ -20,9 +20,9 @@ build:
 environment:
     matrix:
         - generator: "Visual Studio 15 2017"
-          select_sv: -DSTRINGVIEW_LITE_OPT_SELECT_STD=ON
+          select_sv: -DSTRING_VIEW_LITE_OPT_SELECT_STD=ON
         - generator: "Visual Studio 15 2017"
-          select_sv: -DSTRINGVIEW_LITE_OPT_SELECT_NONSTD=ON
+          select_sv: -DSTRING_VIEW_LITE_OPT_SELECT_NONSTD=ON
         - generator: "Visual Studio 14 2015"
         - generator: "Visual Studio 12 2013"
         - generator: "Visual Studio 11 2012"
@@ -49,7 +49,7 @@ matrix:
 
 before_build:
     - mkdir build && cd build
-    - cmake -A %platform% -G "%generator%" "%select_sv%" -DSTRINGVIEW_LITE_OPT_BUILD_TESTS=ON -DSTRINGVIEW_LITE_OPT_BUILD_EXAMPLES=OFF ..
+    - cmake -A %platform% -G "%generator%" "%select_sv%" -DSTRING_VIEW_LITE_OPT_BUILD_TESTS=ON -DSTRING_VIEW_LITE_OPT_BUILD_EXAMPLES=OFF ..
 
 build_script:
     - cmake --build . --config %configuration%

…string_view-lite-config-version.cmake.in …string-view-lite-config-version.cmake.incmake/string_view-lite-config-version.cmake.in renamed to cmake/string-view-lite-config-version.cmake.in cmake/string_view-lite-config-version.cmake.in renamed to cmake/string-view-lite-config-version.cmake.in

@@ -18,8 +18,8 @@ def build(self):
     def package(self):
         """Run CMake install"""
         cmake = CMake(self)
-        cmake.definitions["STRINGVIEW_LITE_OPT_BUILD_TESTS"] = "OFF"
-        cmake.definitions["STRINGVIEW_LITE_OPT_BUILD_EXAMPLES"] = "OFF"
+        cmake.definitions["STRING_VIEW_LITE_OPT_BUILD_TESTS"] = "OFF"
+        cmake.definitions["STRING_VIEW_LITE_OPT_BUILD_EXAMPLES"] = "OFF"
         cmake.configure()
         cmake.install()
 

cmake/string_view-lite-config.cmake.in cmake/string-view-lite-config.cmake.incmake/string_view-lite-config.cmake.in renamed to cmake/string-view-lite-config.cmake.in

@@ -18,8 +18,8 @@
 		<Unit filename="../../LICENSE.txt" />
 		<Unit filename="../../README.md" />
 		<Unit filename="../../appveyor.yml" />
-		<Unit filename="../../cmake/string_view-lite-config-version.cmake.in" />
-		<Unit filename="../../cmake/string_view-lite-config.cmake.in" />
+		<Unit filename="../../cmake/string-view-lite-config-version.cmake.in" />
+		<Unit filename="../../cmake/string-view-lite-config.cmake.in" />
 		<Unit filename="../../conanfile.py" />
 		<Unit filename="../../example/01-basic.cpp" />
 		<Unit filename="../../example/02-no-exceptions.cpp" />
@@ -30,9 +30,9 @@
 		<Unit filename="../../script/upload-conan.py" />
 		<Unit filename="../../test/CMakeLists.txt" />
 		<Unit filename="../../test/lest_cpp03.hpp" />
-		<Unit filename="../../test/string_view-main.t.cpp" />
-		<Unit filename="../../test/string_view-main.t.hpp" />
-		<Unit filename="../../test/string_view.t.cpp" />
+		<Unit filename="../../test/string-view-main.t.cpp" />
+		<Unit filename="../../test/string-view-main.t.hpp" />
+		<Unit filename="../../test/string-view.t.cpp" />
 		<Unit filename="../../test/t-std.bat" />
 		<Unit filename="../../test/t.bat" />
 		<Unit filename="../../test/tc.bat" />

conanfile.py

@@ -11,11 +11,11 @@ endif()
 
 project( test LANGUAGES CXX )
 
-set( unit_name "string_view" )
+set( unit_name "string-view" )
 set( PACKAGE   ${unit_name}-lite )
 set( PROGRAM   ${unit_name}-lite )
 set( SOURCES   ${unit_name}-main.t.cpp ${unit_name}.t.cpp )
-set( HEADER    "nonstd/${unit_name}.hpp" )
+set( HEADER    "nonstd/string_view.hpp" )
 
 message( STATUS "Subproject '${PROJECT_NAME}', programs '${PROGRAM}-*'")
 
@@ -29,8 +29,8 @@ macro( opt option_text var )
     endif()
 endmacro()
 
-opt( STRINGVIEW_LITE_OPT_CONV_STD_STRING_CLASS_METHODS  nssv_CONFIG_CONVERSION_STD_STRING_CLASS_METHODS  )
-opt( STRINGVIEW_LITE_OPT_CONV_STD_STRING_FREE_FUNCTIONS nssv_CONFIG_CONVERSION_STD_STRING_FREE_FUNCTIONS )
+opt( STRING_VIEW_LITE_OPT_CONV_STD_STRING_CLASS_METHODS  nssv_CONFIG_CONVERSION_STD_STRING_CLASS_METHODS  )
+opt( STRING_VIEW_LITE_OPT_CONV_STD_STRING_FREE_FUNCTIONS nssv_CONFIG_CONVERSION_STD_STRING_FREE_FUNCTIONS )
 
 set( DEFCMN  -Dnssv_STRING_VIEW_HEADER=\"${HEADER}\"
              -Dnssv_CONFIG_CONVERSION_STD_STRING_CLASS_METHODS=${nssv_CONFIG_CONVERSION_STD_STRING_CLASS_METHODS}
@@ -196,9 +196,9 @@ endif()
 if( HAS_CPP17_FLAG )
     set( WHICH nssv_STRING_VIEW_DEFAULT )
 
-    if( STRINGVIEW_LITE_OPT_SELECT_STD )
+    if( STRING_VIEW_LITE_OPT_SELECT_STD )
         set( WHICH nssv_STRING_VIEW_STD )
-    elseif( STRINGVIEW_LITE_OPT_SELECT_NONSTD )
+    elseif( STRING_VIEW_LITE_OPT_SELECT_NONSTD )
         set( WHICH nssv_STRING_VIEW_NONSTD )
     endif()
 

project/CodeBlocks/string-view-lite.cbp

@@ -5,7 +5,7 @@
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include "string_view-main.t.hpp"
+#include "string-view-main.t.hpp"
 
 #define nssv_PRESENT( x ) \
     std::cout << #x << ": " << x << "\n"

test/CMakeLists.txt

@@ -27,7 +27,7 @@
 
 // Limit C++ Core Guidelines checking to GSL Lite:
 
-#if defined(_MSC_VER) && _MSC_VER >= 1910
+#if nssv_COMPILER_MSVC_VER >= 1910
 # include <CppCoreCheck/Warnings.h>
 # pragma warning(disable: ALL_CPPCORECHECK_WARNINGS)
 #endif