.

Author: beached

CMakeLists.txt

@@ -12,20 +12,43 @@ find_package( Threads REQUIRED )
 enable_testing( )
 add_definitions( -DBOOST_TEST_DYN_LINK ) 
 
+
+set( CMAKE_CXX_STANDARD 17 CACHE STRING "The C++ standard whose features are requested.")
+
 include( "${CMAKE_SOURCE_DIR}/dependent_projects/CMakeListsCompiler.txt" )
 
-include_directories( "./include" )
 set( DEP_ROOT_DIR_BASE "${CMAKE_SOURCE_DIR}/dependent_projects/build" )
 if( "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" )
 	set( DEP_ROOT_DIR "${DEP_ROOT_DIR_BASE}/debug" )
+	set( GLEAN_CACHE "${CMAKE_SOURCE_DIR}/.glean/debug" )
+	set( GLEAN_CACHE2 "${CMAKE_SOURCE_DIR}/.glean/release" )
 elseif( "${CMAKE_BUILD_TYPE}" STREQUAL "Release" )
 	set( DEP_ROOT_DIR "${DEP_ROOT_DIR_BASE}/release" )
-elseif( "${CMAKE_BUILD_TYPE}" STREQUAL "" )
+	set( GLEAN_CACHE "${CMAKE_SOURCE_DIR}/.glean/release" )
+	set( GLEAN_CACHE2 "${CMAKE_SOURCE_DIR}/.glean/debug" )
+else( )
 	set( DEP_ROOT_DIR "${DEP_ROOT_DIR_BASE}/release" )
+	set( GLEAN_CACHE "${CMAKE_SOURCE_DIR}/.glean/release" )
+	set( GLEAN_CACHE2 "${CMAKE_SOURCE_DIR}/.glean/debug" )
 endif( )
 
 message( "Building for: ${CMAKE_BUILD_TYPE}" )
-if( EXISTS "${DEP_ROOT_DIR}" )
+message( "Checking for glean cache: '${GLEAN_CACHE}'" )
+if( EXISTS "${GLEAN_CACHE}" )
+	message( "using glean dependencies" )
+	add_custom_target( dependency_stub )
+	include_directories( SYSTEM "${GLEAN_CACHE}/include" )
+	link_directories( "${GLEAN_CACHE}/lib" )
+elseif( EXISTS "${GLEAN_CACHE2}" )
+	message( "looks like glean is in use but missing ${GLEAN_CACHE}" )
+elseif( EXISTS "${CMAKE_SOURCE_DIR}/glean.cmake" )
+	message( "glean.cmake detected" )
+	include( "${CMAKE_SOURCE_DIR}/glean.cmake" )
+	add_library( dependency_stub STATIC "${CMAKE_SOURCE_DIR}/dependent_projects/stub.cpp" )
+	add_dependencies( dependency_stub ${DEP_PROJECT_DEPS} )
+	include_directories( SYSTEM "${CMAKE_BINARY_DIR}/install/include" )
+	link_directories( "${CMAKE_BINARY_DIR}/install/lib" )
+elseif( EXISTS "${DEP_ROOT_DIR}" )
 	message( "${DEP_ROOT_DIR}" )
 	message( "using dependency folder" )
 	add_custom_target( dependency_stub )

include/ti_value.h

@@ -38,15 +38,15 @@ namespace daw::json_to_cpp::types {
 	struct ti_value {
 		ti_types_t value;
 
-		template<
-		  typename Derived,
-		  daw::enable_if_t<std::is_constructible_v<ti_types_t, Derived>> = nullptr>
+		template<typename Derived,
+		         daw::enable_when_t<std::is_constructible_v<ti_types_t, Derived>> =
+		           nullptr>
 		explicit constexpr ti_value( Derived &&other )
 		  : value( std::forward<Derived>( other ) ) {}
 
-		template<
-		  typename Derived,
-		  daw::enable_if_t<std::is_constructible_v<ti_types_t, Derived>> = nullptr>
+		template<typename Derived,
+		         daw::enable_when_t<std::is_constructible_v<ti_types_t, Derived>> =
+		           nullptr>
 		constexpr ti_value &operator=( Derived &&rhs ) {
 			value = std::forward<Derived>( rhs );
 			return *this;
@@ -57,12 +57,13 @@ namespace daw::json_to_cpp::types {
 			                      []( auto const &item ) { return item.name( ); } );
 		}
 
-		inline std::string json_name( std::string member_name,
-		                              bool use_cpp20, daw::string_view parent_name ) const noexcept {
-			return daw::visit_nt( value,
-			                      [&member_name, use_cpp20, parent_name]( auto const &item ) {
-				                      return item.json_name( member_name, use_cpp20, parent_name );
-			                      } );
+		inline std::string json_name( std::string member_name, bool use_cpp20,
+		                              daw::string_view parent_name ) const
+		  noexcept {
+			return daw::visit_nt(
+			  value, [&member_name, use_cpp20, parent_name]( auto const &item ) {
+				  return item.json_name( member_name, use_cpp20, parent_name );
+			  } );
 		}
 
 		inline std::string array_member_info( ) const {