Fixed #1, updated to build full utf_range and removed lib dep on

temp_file as it is header only now

Author: beached

CMakeLists.txt

@@ -90,7 +90,7 @@ target_link_libraries( json_to_cpp_lib utf_range utf_string ${Boost_LIBRARIES} $
 
 add_executable( json_to_cpp ${HEADER_FILES} ${SOURCE_FOLDER}/main.cpp )
 add_dependencies( json_to_cpp dependency_stub )
-target_link_libraries( json_to_cpp json_to_cpp_lib parse_json utf_range temp_file ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${CURL_LIBRARIES} )
+target_link_libraries( json_to_cpp json_to_cpp_lib parse_json utf_range ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${CURL_LIBRARIES} )
 
 #install( TARGETS json_to_cpp DESTINATION lib )
 install( TARGETS json_to_cpp DESTINATION bin )

glean.cmake

@@ -1,4 +1,3 @@
-
 include( ExternalProject )
 externalproject_add(
   temp_file_prj
@@ -8,6 +7,14 @@ externalproject_add(
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/install -DGLEAN_INSTALL_ROOT=${CMAKE_BINARY_DIR}/install
 )
 
+externalproject_add(
+  date_prj
+  GIT_REPOSITORY "https://github.com/beached/date.git"
+  SOURCE_DIR "${CMAKE_BINARY_DIR}/dependencies/date"
+  INSTALL_DIR "${CMAKE_BINARY_DIR}/install"
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/install -DGLEAN_INSTALL_ROOT=${CMAKE_BINARY_DIR}/install
+)
+
 externalproject_add(
   header_libraries_prj
   GIT_REPOSITORY "https://github.com/beached/header_libraries.git"
@@ -18,19 +25,11 @@ externalproject_add(
 
 externalproject_add(
   utf_range_prj
-  GIT_REPOSITORY "https://github.com/beached/utf_range.git"
   DEPENDS header_libraries_prj
+  GIT_REPOSITORY "https://github.com/beached/utf_range.git"
   SOURCE_DIR "${CMAKE_BINARY_DIR}/dependencies/utf_range"
   INSTALL_DIR "${CMAKE_BINARY_DIR}/install"
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/install -DGLEAN_INSTALL_ROOT=${CMAKE_BINARY_DIR}/install
-)
-
-externalproject_add(
-  date_prj
-  GIT_REPOSITORY "https://github.com/beached/date.git"
-  SOURCE_DIR "${CMAKE_BINARY_DIR}/dependencies/date"
-  INSTALL_DIR "${CMAKE_BINARY_DIR}/install"
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/install -DGLEAN_INSTALL_ROOT=${CMAKE_BINARY_DIR}/install -DUSE_SYSTEM_TZ_DB=ON -DENABLE_DATE_TESTING=OFF -DCMAKE_CXX_STANDARD=17
+	CMAKE_ARGS -DDAW_USE_FULL_LIBRARY=On -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/install -DGLEAN_INSTALL_ROOT=${CMAKE_BINARY_DIR}/install
 )
 
 externalproject_add(

glean.json

@@ -18,7 +18,8 @@
 			"provides": "utf_range",
 			"download_type": "git",
 			"build_type": "cmake",
-    	"uri": "https://github.com/beached/utf_range.git"
+    	"uri": "https://github.com/beached/utf_range.git",
+			"cmake_args": [ "-DDAW_USE_FULL_LIBRARY=ON" ]
 		},
 		{
 			"provides": "date",

src/curl_t.cpp

@@ -109,7 +109,7 @@ namespace daw::curl {
 		headers.append( "charsets: utf-8" );
 
 		auto curl = curl_t( );
-		if( !curl ) {
+		if( not curl ) {
 			return std::nullopt;
 		}
 		curl.setopt( CURLOPT_HTTPHEADER, headers.get( ) );
@@ -151,7 +151,7 @@ namespace daw::curl {
 	}
 
 	bool is_url( daw::string_view path ) {
-		return boost::starts_with( path.data( ), "http://" ) ||
+		return boost::starts_with( path.data( ), "http://" ) or
 		       boost::starts_with( path.data( ), "https://" );
 	}
 } // namespace daw::curl

src/json_to_cpp.cpp

@@ -245,8 +245,8 @@ namespace daw::json_to_cpp {
 		                   std::vector<types::ti_object> &obj_info,
 		                   state_t &obj_state, config_t const &config ) {
 
-			using ::daw::json::json_value_t;
-			using namespace ::daw::json_to_cpp::types;
+			using daw::json::json_value_t;
+			using namespace daw::json_to_cpp::types;
 			if( current_item.is_integer( ) ) {
 				obj_state.has_integrals = true;
 				return ti_integral( );
@@ -336,7 +336,7 @@ namespace daw::json_to_cpp {
 				parse_json_object( current_item, config.root_object_name, result,
 				                   obj_state, config );
 			} else {
-				auto root_obj_member = ::daw::json::make_object_value_item(
+				auto root_obj_member = daw::json::make_object_value_item(
 				  config.root_object_name.c_str( ), current_item );
 				auto root_object = json_object_value( );
 				root_object.members_v.push_back( std::move( root_obj_member ) );
@@ -529,7 +529,7 @@ namespace daw::json_to_cpp {
 
 	void generate_cpp( daw::string_view json_string, config_t &config ) {
 		auto obj_state = state_t( );
-		auto json_obj = ::daw::json::parse_json( json_string );
+		auto json_obj = daw::json::parse_json( json_string );
 		auto obj_info = parse_json_object( json_obj, obj_state, config );
 		generate_code( obj_info, config, obj_state );
 	}

src/ti_array.cpp

@@ -62,23 +62,22 @@ namespace daw::json_to_cpp::types {
 			return "std::vector<" + ti_null::name( ) + ">";
 		}
 		return "std::vector<" +
-		       ::daw::json_to_cpp::types::name( children->front( ).second ) + ">";
+		       daw::json_to_cpp::types::name( children->front( ).second ) + ">";
 	}
 
 	std::string ti_array::json_name( daw::string_view member_name, bool use_cpp20,
 	                                 daw::string_view parent_name ) const {
 		if( children->empty( ) ) {
 			return "json_array<" +
-			       impl::format_member_name( member_name, use_cpp20, parent_name ) + 
-						 ", " + ti_null::array_member_info( ) +
-			       ", " + name( )  + ">";
+			       impl::format_member_name( member_name, use_cpp20, parent_name ) +
+			       ", " + ti_null::array_member_info( ) + ", " + name( ) + ">";
 		}
 		return "json_array<" +
 		       impl::format_member_name( member_name, use_cpp20, parent_name ) +
-					 ", " + daw::json_to_cpp::types::array_member_info(
+		       ", " +
+		       daw::json_to_cpp::types::array_member_info(
 		         children->front( ).second ) +
-		       ", " + name( ) + 
-		       ">";
+		       ", " + name( ) + ">";
 	}
 
 	std::string ti_array::array_member_info( ) const {