Modernized cmake and relicenced under BSL

Author: beached

CMakeLists.txt

@@ -1,63 +1,31 @@
-cmake_minimum_required( VERSION 3.10 )
+# Copyright (c) Darrell Wright
+#
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE or copy at http://www.boost.org/LICENSE_1_0.txt)
+#
+# Official repository: https://github.com/beached/json_to_cpp
+#
 
-project( json_to_cpp_prj )
 
-include( ExternalProject )
+cmake_minimum_required(VERSION 3.13)
 
-find_package( Boost 1.60.0 COMPONENTS system date_time iostreams program_options filesystem regex unit_test_framework REQUIRED )
+project("json_to_cpp"
+        VERSION "1.0.0"
+				DESCRIPTION "Try to use the JSON structures to make C++ structures and bindings"
+        HOMEPAGE_URL "https://github.com/beached/json_to_cpp"
+        LANGUAGES C CXX)
 
-find_package( CURL )
-find_package( Threads REQUIRED )
+set(CMAKE_CXX_STANDARD 17 CACHE STRING "The C++ standard whose features are requested.")
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
-enable_testing( )
-add_definitions( -DBOOST_TEST_DYN_LINK ) 
+find_package( Boost 1.60.0 COMPONENTS program_options REQUIRED )
+find_package( CURL REQUIRED )
+find_package( OpenSSL REQUIRED )
+add_subdirectory(extern)
 
-
-set( CMAKE_CXX_STANDARD 17 CACHE STRING "The C++ standard whose features are requested.")
-
-include( "${CMAKE_SOURCE_DIR}/dependent_projects/CMakeListsCompiler.txt" )
-
-if( "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" )
-	set( GLEAN_CACHE "${CMAKE_SOURCE_DIR}/.glean/debug" )
-	set( GLEAN_CACHE2 "${CMAKE_SOURCE_DIR}/.glean/release" )
-elseif( "${CMAKE_BUILD_TYPE}" STREQUAL "Release" )
-	set( GLEAN_CACHE "${CMAKE_SOURCE_DIR}/.glean/release" )
-	set( GLEAN_CACHE2 "${CMAKE_SOURCE_DIR}/.glean/debug" )
-else( )
-	set( GLEAN_CACHE "${CMAKE_SOURCE_DIR}/.glean/release" )
-	set( GLEAN_CACHE2 "${CMAKE_SOURCE_DIR}/.glean/debug" )
-endif( )
-
-message( "Building for: ${CMAKE_BUILD_TYPE}" )
-message( "Checking for glean cache: '${GLEAN_CACHE}'" )
-if( EXISTS "${GLEAN_CACHE}" )
-	message( "using glean dependencies at ${GLEAN_CACHE}" )
-	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" )
-endif( )
-
-set( HEADER_FOLDER "include" )
-set( SOURCE_FOLDER "src" )
-set( TEST_FOLDER "tests" )
-
-include_directories( SYSTEM "${CMAKE_BINARY_DIR}/install/include" )
-include_directories( ${HEADER_FOLDER} )
-include_directories( SYSTEM ${OPENSSL_INCLUDE_DIR} )
-include_directories( SYSTEM ${CURL_INCLUDE_DIRS} )
-include_directories( SYSTEM ${Boost_INCLUDE_DIRS} )
-
-link_directories( "${CMAKE_BINARY_DIR}/install/lib" )
-link_directories( ${Boost_LIBRARY_DIRS} )
+set( HEADER_FOLDER include )
+set( SOURCE_FOLDER src )
 
 set( HEADER_FILES
 	${HEADER_FOLDER}/curl_t.h
@@ -82,17 +50,22 @@ set( SOURCE_FILES
 	${SOURCE_FOLDER}/ti_array.cpp
 	${SOURCE_FOLDER}/ti_kv.cpp
 	${SOURCE_FOLDER}/ti_object.cpp
+	${SOURCE_FOLDER}/main.cpp
 )
 
-add_library( json_to_cpp_lib ${HEADER_FILES} ${SOURCE_FILES} )
-add_dependencies( json_to_cpp_lib dependency_stub )
-target_link_libraries( json_to_cpp_lib utf_range utf_string ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} )
-
-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 ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${CURL_LIBRARIES} )
+add_executable( ${PROJECT_NAME} ${HEADER_FILES} ${SOURCE_FILES} )
+target_link_libraries( ${PROJECT_NAME} PRIVATE
+	daw::parse_json 
+	daw::utf_range 
+	daw::header_libraries 
+	Boost::program_options
+	daw::libtemp_file 
+	date::date
+	OpenSSL::SSL
+	OpenSSL::Crypto
+	CURL::libcurl
+)
+target_include_directories( ${PROJECT_NAME} PRIVATE ${HEADER_FOLDER} )
 
-#install( TARGETS json_to_cpp DESTINATION lib )
-install( TARGETS json_to_cpp DESTINATION bin )
-#install( DIRECTORY ${HEADER_FOLDER}/ DESTINATION include/daw/json_to_cpp )
+install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
 

LICENSE

@@ -1,21 +1,25 @@
-MIT License
+Copyright (c) Darrell Wright
 
-Copyright (c) 2016-2019 Darrell Wright
+Boost Software License - Version 1.0 - August 17th, 2003
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.

dependent_projects/CMakeListsCompiler.txt

@@ -0,0 +1,46 @@
+# Copyright (c) Darrell Wright
+#
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE or copy at http://www.boost.org/LICENSE_1_0.txt)
+#
+# Official repository: https://github.com/beached/json_to_cpp
+#
+
+# This prevents tests running on dependencies
+option( DAW_ENABLE_TESTING "Build unit tests" OFF )
+if( DAW_ENABLE_TESTING )
+	set( DAW_ENABLE_TESTING OFF )
+endif( )
+
+include( FetchContent )
+set( FETCHCONTENT_UPDATES_DISCONNECTED ON )
+
+FetchContent_Declare(
+	daw_header_libraries
+	GIT_REPOSITORY https://github.com/beached/header_libraries.git
+)
+
+FetchContent_Declare(
+	daw_utf_range
+	GIT_REPOSITORY https://github.com/beached/utf_range.git
+)
+
+FetchContent_Declare(
+	daw_parse_json
+	GIT_REPOSITORY https://github.com/beached/parse_json.git
+)
+
+FetchContent_Declare(
+	daw_libtemp_file
+	GIT_REPOSITORY https://github.com/beached/libtemp_file.git
+)
+
+option( ENABLE_DATE_TESTING "" OFF )
+option( USE_SYSTEM_TZ_DB "" ON )
+FetchContent_Declare(
+	date
+	GIT_REPOSITORY https://github.com/howardhinnant/date.git
+)
+
+FetchContent_MakeAvailable(daw_header_libraries daw_utf_range daw_parse_json daw_libtemp_file date )
+

dependent_projects/stub.cpp

@@ -1,24 +1,10 @@
-// The MIT License (MIT)
+// Copyright (c) Darrell Wright
 //
-// Copyright (c) 2019 Darrell Wright
+// Distributed under the Boost Software License, version 1.0. (see accompanying
+// file license or copy at http://www.boost.org/license_1_0.txt)
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files( the "Software" ), to
-// deal in the Software without restriction, including without limitation the
-// rights to use, copy, modify, merge, publish, distribute, sublicense, and / or
-// sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
+// Official repository: https://github.com/beached/daw_json_link
 //
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
 
 #pragma once