diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 69f6632a..388850a3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,31 +21,4 @@ jobs: cmake -G "Visual Studio 16 2019" -D BUILD_TESTS=ON ./ make -# - name: Run tests -# run: ./test/etl_tests - -# steps: - - -# - name: Add msbuild to PATH -# uses: microsoft/setup-msbuild@v1.0.1 - -# - name: Directories -# run: | -# echo ::set-env name=workspace::$GITHUB_WORKSPACE -# echo ${{ github.workspace }} -# echo ${{ github.workspace }}/../unittest-cpp - - -# - name: Checkout UnitTest++ -# uses: actions/checkout@v2 -# with: -# repository: unittest-cpp/unittest-cpp -# path: ${{ github.workspace }}/../unittest-cpp -# -# - name: Build -# run: MSBuild.exe test/vs2019/etl.sln - -# - name: Run tests -# run: ./test/etl_tests diff --git a/CMakeLists.txt b/CMakeLists.txt index 72627167..05f8721a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,15 +4,6 @@ cmake_minimum_required(VERSION 3.5.0) project(etl) -####################################################################### -# Define an option to allow consumers of the library to -# specify the profile they would like to compile to. If -# not explicitly set CMake will attempt to choose an appropriate -# profile based on the compiler -####################################################################### -set(ETL_PROFILE "DEFAULT" CACHE STRING "Defines what profile header to include. See https://www.etlcpp.com/setup.html" -) - option(BUILD_TESTS "Build unit tests" OFF) add_library(etl INTERFACE) @@ -20,42 +11,12 @@ add_library(etl INTERFACE) target_include_directories(etl INTERFACE include - include/etl/profiles ) -if (${ETL_PROFILE} STREQUAL DEFAULT) - if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") - set(ETL_PROFILE "PROFILE_GCC_GENERIC") - - elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") - set(ETL_PROFILE "PROFILE_CLANG_GENERIC") - - elseif (CMAKE_CXX_COMPILER_ID MATCHES "MSVC") - set(ETL_PROFILE "PROFILE_MSVC") - - elseif (CMAKE_CXX_COMPILER_ID MATCHES "ARMCC") - if (CXX_STANDARD EQUAL 11) - set(ETL_PROFILE "PROFILE_ARMV6") - else () - set(ETL_PROFILE "PROFILE_ARMV5") - endif() - elseif (CMAKE_CXX_COMPILER_ID MATCHES "TI") - set(ETL_PROFILE "PROFILE_TICC") - - else() - message(FATAL_ERROR "Can't generate default profile for compiler: ${CMAKE_CXX_COMPILER_ID}") - endif() -endif() - -message(STATUS "Compiling with ETL profile set to: ${ETL_PROFILE}") - target_compile_definitions(etl INTERFACE - ${ETL_PROFILE} ) - - if (BUILD_TESTS) enable_testing() add_subdirectory(test)