new project structure

2025-12-13 04:56:49 +07:00 · 2019-05-13 00:46:08 +07:00
parent b90439b393
commit 4b41f21bd2
9 changed files with 73 additions and 14424 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,7 +1,9 @@
 version: "{build}"
 shallow_clone: true
 image:
+  - Visual Studio 2015
  - Visual Studio 2017
+  - Visual Studio 2019 Preview
 platform:
  - Win32
  - x64
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,6 @@
 language: cpp
 matrix:
  include:
-    - os: linux
-      dist: trusty
-      addons: { apt: { sources: ubuntu-toolchain-r-test, packages: ["xorg-dev", "g++-6"] } }
-      env: MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
    - os: linux
      dist: trusty
      addons: { apt: { sources: ubuntu-toolchain-r-test, packages: ["xorg-dev", "g++-7"] } }
@@ -13,18 +9,6 @@ matrix:
      dist: trusty
      addons: { apt: { sources: ubuntu-toolchain-r-test, packages: ["xorg-dev", "g++-8"] } }
      env: MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
-    - os: linux
-      dist: trusty
-      addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-precise-3.8"], packages: ["xorg-dev", "clang-3.8", "g++-5"] } }
-      env: MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8"
-    - os: linux
-      dist: trusty
-      addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-precise-3.9"], packages: ["xorg-dev", "clang-3.9", "g++-5"] } }
-      env: MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9"
-    - os: linux
-      dist: trusty
-      addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-4.0"], packages: ["xorg-dev", "clang-4.0", "g++-5"] } }
-      env: MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0"
    - os: linux
      dist: trusty
      addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-5.0"], packages: ["xorg-dev", "clang-5.0", "g++-7"] } }
@@ -33,9 +17,14 @@ matrix:
      dist: trusty
      addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-6.0"], packages: ["xorg-dev", "clang-6.0", "g++-7"] } }
      env: MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0"
-    - os: osx
-      osx_image: xcode8.3
-      compiler: clang
+    - os: linux
+      dist: trusty
+      addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-7"], packages: ["xorg-dev", "clang-7", "g++-7"] } }
+      env: MATRIX_EVAL="CC=clang-7 && CXX=clang++-7"
+    - os: linux
+      dist: trusty
+      addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-8"], packages: ["xorg-dev", "clang-8", "g++-7"] } }
+      env: MATRIX_EVAL="CC=clang-8 && CXX=clang++-8"
    - os: osx
      osx_image: xcode9
      compiler: clang
@@ -58,5 +47,16 @@ matrix:
      after_success: ./scripts/upload_coverage.sh
 before_install:
  - eval "${MATRIX_EVAL}"
+  - if [ "$TRAVIS_OS_NAME" == 'osx' ]; then
+    brew update;
+    brew upgrade cmake;
+    brew install git-lfs;
+    fi
+  - if [ "$TRAVIS_OS_NAME" == 'linux' ]; then
+    mkdir $HOME/cmake;
+    export PATH="$HOME/cmake/bin:$PATH";
+    travis_retry wget -q https://cmake.org/files/v3.11/cmake-3.11.4-Linux-x86_64.sh;
+    sh cmake-3.11.4-Linux-x86_64.sh --prefix=$HOME/cmake --exclude-subdir --skip-license;
+    fi
 script:
  - ./scripts/build_all.sh
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,43 +1,28 @@
-cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
-project(kari)
+# 3.8 version is required for `cxx_std_14`
+cmake_minimum_required(VERSION 3.8 FATAL_ERROR)

-#
-# coverage mode
-#
-
-option(KARI_BUILD_WITH_COVERAGE "Build with coverage" OFF)
-if(KARI_BUILD_WITH_COVERAGE AND (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang"))
-    add_definitions(-DKARI_BUILD_WITH_COVERAGE)
-    set(KARI_COVERAGE_FLAGS "--coverage")
-    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${KARI_COVERAGE_FLAGS}")
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${KARI_COVERAGE_FLAGS}")
-    set(CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} ${KARI_COVERAGE_FLAGS}")
+if(NOT DEFINED PROJECT_NAME)
+    set(BUILD_AS_STANDALONE ON)
 endif()

-#
-# sanitizer mode
-#
+project(kari.hpp)

-option(KARI_BUILD_WITH_SANITIZER "Build with sanitizer" OFF)
-if(KARI_BUILD_WITH_SANITIZER AND (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang"))
-    add_definitions(-DKARI_BUILD_WITH_SANITIZER)
-    set(KARI_SANITIZER_FLAGS "-fno-omit-frame-pointer -fsanitize=address")
-    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${KARI_SANITIZER_FLAGS}")
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${KARI_SANITIZER_FLAGS}")
-    set(CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} ${KARI_SANITIZER_FLAGS}")
+add_library(${PROJECT_NAME} INTERFACE)
+target_include_directories(${PROJECT_NAME} INTERFACE headers)
+target_compile_features(${PROJECT_NAME} INTERFACE cxx_std_14)
+
+if(BUILD_AS_STANDALONE)
+    option(BUILD_WITH_UNTESTS "Build with unit tests" ON)
+    if(BUILD_WITH_UNTESTS)
+        enable_testing()
+        add_subdirectory(untests)
+    endif()
+
+    option(BUILD_WITH_COVERAGE "Build with coverage" OFF)
+    if(BUILD_WITH_COVERAGE AND (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang"))
+        set(COVERAGE_FLAGS "--coverage")
+        set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COVERAGE_FLAGS}")
+        set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COVERAGE_FLAGS}")
+        set(CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} ${COVERAGE_FLAGS}")
+    endif()
 endif()
-
-#
-# tests executable
-#
-
-file(GLOB test_sources "*.cpp" "*.hpp")
-add_executable(${PROJECT_NAME} ${test_sources})
-
-set_target_properties(${PROJECT_NAME} PROPERTIES
-    CXX_STANDARD 14
-    CXX_STANDARD_REQUIRED YES
-    CXX_EXTENSIONS NO)
-
-enable_testing()
-add_test(${PROJECT_NAME} ${PROJECT_NAME})
--- a/catch.hpp
+++ b/catch.hpp
--- a/headers/kari_hpp/kari.hpp
+++ b/headers/kari_hpp/kari.hpp
--- a/scripts/upload_coverage.sh
+++ b/scripts/upload_coverage.sh
@@ -4,7 +4,7 @@ set -e
 BUILD_DIR=`dirname "$BASH_SOURCE"`/../build
 mkdir -p $BUILD_DIR/coverage
 cd $BUILD_DIR/coverage
-cmake -DCMAKE_BUILD_TYPE=Debug -DKARI_BUILD_WITH_COVERAGE=ON ../..
+cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_WITH_COVERAGE=ON ../..
 cmake --build . -- -j8

 lcov -d . -z
--- a/untests/CMakeLists.txt
+++ b/untests/CMakeLists.txt
@@ -0,0 +1,24 @@
+# 3.11 version is required for `FetchContent`
+cmake_minimum_required(VERSION 3.11 FATAL_ERROR)
+
+project(kari.hpp.untests)
+
+set(CATCH_BUILD_TESTING OFF CACHE BOOL "" FORCE)
+
+include(FetchContent)
+FetchContent_Declare(
+    catch2
+    GIT_REPOSITORY https://github.com/catchorg/catch2)
+
+FetchContent_GetProperties(catch2)
+if(NOT catch2_POPULATED)
+    FetchContent_Populate(catch2)
+    add_subdirectory(${catch2_SOURCE_DIR} ${catch2_BINARY_DIR})
+endif()
+
+file(GLOB UNTESTS_SOURCES "*.cpp" "*.hpp")
+add_executable(${PROJECT_NAME} ${UNTESTS_SOURCES})
+target_link_libraries(${PROJECT_NAME}
+    Catch2
+    kari.hpp)
+add_test(${PROJECT_NAME} ${PROJECT_NAME})
--- a/untests/catch_main.cpp
+++ b/untests/catch_main.cpp
@@ -1,9 +1,9 @@
 /*******************************************************************************
 * This file is part of the "https://github.com/BlackMATov/kari.hpp"
 * For conditions of distribution and use, see copyright notice in LICENSE.md
- * Copyright (C) 2018 Matvey Cherevko
+ * Copyright (C) 2017-2019, by Matvey Cherevko (blackmatov@gmail.com)
 ******************************************************************************/

 #define CATCH_CONFIG_MAIN
 #define CATCH_CONFIG_FAST_COMPILE
-#include "catch.hpp"
+#include <catch2/catch.hpp>
--- a/untests/kari_tests.cpp
+++ b/untests/kari_tests.cpp
@@ -5,9 +5,9 @@
 ******************************************************************************/

 #define CATCH_CONFIG_FAST_COMPILE
-#include "catch.hpp"
+#include <catch2/catch.hpp>

-#include "kari.hpp"
+#include <kari_hpp/kari.hpp>

 #include <cstdio>
 #include <cstring>