Get rid of submodules.

Author: ObiWahn

.appveyor.yml

@@ -24,9 +24,6 @@ environment:
 init: []
 
 install:
-  - git submodule update --init --recursive
-  - cd external_libs
-  - cd ..
 
 before_build:
   - if defined BINDIR (set "PATH=%BINDIR%;%PATH:C:\Program Files\Git\usr\bin;=%")

.clang-format

@@ -1,6 +0,0 @@
-[submodule "ext-basics"]
-	path = external_libs/ext-basics
-	url = https://github.com/extcpp/basics.git
-[submodule "cmake"]
-	path = cmake
-	url = https://github.com/extcpp/cmake.git

.gitmodules

@@ -11,7 +11,7 @@
 # https://apt.llvm.org/
 
 os: linux
-dist: bionic
+dist: focal
 language: cpp
 sudo: required
 
@@ -67,7 +67,7 @@ matrix:
         apt:
           sources:
             #- ['ubuntu-toolchain-r-test', 'llvm-toolchain-xenial-8']
-            - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main'
+            - sourceline: 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main'
               key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
           packages: ['clang-10', 'clang++-10', 'clang-format-10', 'clang-tools-10', 'libc++-10-dev', 'libc++abi-10-dev']
 

.travis.yml

@@ -1,34 +1,25 @@
 # Copyright - 2016-2020 - Jan Christoph Uhde <[email protected]>
 
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.14)
 project(ext-logging VERSION 0.0.1 LANGUAGES CXX)
 message(STATUS "extINFO -- entering ext-logging")
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 ## OPTIONS
-option(EXTLOG_EXAMPLES "build examples" OFF)
-option(EXTLOG_WARNINGS "enable warnings" ON)
-option(EXTLOG_CHECKED "user assert" ON)
-option(EXTLOG_TESTS "build tests" OFF)
+option(EXTLOG_EXAMPLES       "build examples" OFF)
+option(EXTLOG_WARNINGS       "enable warnings" ON)
+option(EXTLOG_CHECKED        "user assert" ON)
+option(EXTLOG_TESTS          "build tests" OFF)
 option(EXTLOG_ENABLE_VIM_GDB "support vim / gdb" ON)
 
-## general setup and includes
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set_property(GLOBAL PROPERTY USE_FOLDERS ON) # XCode / VS folders
-
-set(LIBEXT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external_libs/ext-basics)
+# enable extcpp cmake
+set(EXT_LIBRARIES_PATH "${CMAKE_LIST_SOURCE_DIR}/.." CACHE STRING "path to extcpp libraries")
+include(${CMAKE_CURRENT_LIST_DIR}/ext_cmake_enable.cmake)
 include(ext_cmake_setup)
-include(ext_cmake_install)
+ext_enable_ext_libs(basics)
 
+set_property(GLOBAL PROPERTY USE_FOLDERS ON) # XCode / VS folders
 find_package(Threads REQUIRED)
-if(NOT TARGET ext::basics)
-    add_subdirectory(external_libs/ext-basics EXCLUDE_FROM_ALL)
-endif()
-
-set(FORCE_COLORED_OUTPUT ON)
-ext_colored_compiler_ouput()
 
 # verbose windows linking
 #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /VERBOSE:LIB")
@@ -124,5 +115,5 @@ add_custom_target(
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
     COMMAND ${CMAKE_COMMAND}
                 -D "EXT_GIT_VERSION_OUT_FILE=${CMAKE_CURRENT_BINARY_DIR}/ext_logging_version.hpp"
-                -P "${CMAKE_CURRENT_SOURCE_DIR}/cmake/ext_script_git_version.cmake"
+                -P "${ext_cmake_dir}/ext_script_git_version.cmake"
 )

CMakeLists.txt

@@ -0,0 +1,48 @@
+#TODO use version parameter to ensure a certaion version
+if(EXT_CMAKE_ENABLED)
+    return()
+endif()
+
+#try some common paths
+set(ext_cmake_dir_hints
+    "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
+    "${CMAKE_CURRENT_SOURCE_DIR}/../cmake"
+    "${CMAKE_CURRENT_SOURCE_DIR}/../basics/cmake"
+    "${EXT_CMAKE_PATH}"
+    "${EXT_LIBRARIES_PATH}/cmake"
+    "${EXT_LIBRARIES_PATH}/basics/cmake"
+)
+
+foreach(ext_cmake_dir_candidate IN LISTS EXT_CMAKE_HINTS EXT_CMAKE_PATHS ext_cmake_dir_hints)
+    set(ext_cmake_dir "${ext_cmake_dir_candidate}")
+    if(EXISTS ${ext_cmake_dir}/ext_script_git_version.cmake)
+        message(STATUS "extINFO -- found ext cmake directory in: ${ext_cmake_dir}")
+        break()
+    endif()
+endforeach()
+
+#download
+if(NOT EXISTS ${ext_cmake_dir}/ext_script_git_version.cmake)
+    message(STATUS "extINFO -- downloading extcpp/cmake")
+    #if there is a cmake directory just use that
+    include(FetchContent)
+    FetchContent_Declare(ext_cmake_github
+        GIT_REPOSITORY https://github.com/extcpp/cmake.git
+        GIT_TAG master
+        GIT_PROGRESS TRUE
+    )
+    FetchContent_MakeAvailable(ext_cmake_github)
+    message("downloaded ext/cmake to: ${ext_cmake_github_SOURCE_DIR}")
+    set(ext_cmake_dir "${ext_cmake_github_SOURCE_DIR}")
+endif()
+
+#final check and include
+if(NOT EXISTS ${ext_cmake_dir}/ext_script_git_version.cmake)
+    message(FATAL_ERROR "Could not locate extcpp/cmake directory!")
+else()
+    list(APPEND CMAKE_MODULE_PATH "${ext_cmake_dir}")
+endif()
+
+message(STATUS "extINFO -- CMAKE_MODULE_PATH: ${CMAKE_MODULE_PATH}")
+
+set(EXT_CMAKE_ENABLED TRUE)