From 5821ae7c396a076d757b5438f997a7f484cbd025 Mon Sep 17 00:00:00 2001
From: seleznevae <seleznevae@protonmail.com>
Date: Sun, 18 Mar 2018 19:02:53 +0300
Subject: [PATCH] [F] Simplified build

---
 .travis.yml    | 22 +++++++++++++++-----
 CMakeLists.txt | 54 ++++++++++++++++++++++++++++----------------------
 appveyor.yml   |  2 +-
 3 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8e96138..2240a31 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,25 +25,37 @@ script:
   - cmake --version
 
   # Perform out-of-source build(CMake backend generation, build, and test)
-  # Test build without optimizations
+  # Test build without optimizations and with asan
   - mkdir -p build
   - cd build
-  - cmake .. -DFORT_BUILD_TYPE=asan -DFORT_COMPILER=${FORT_COMPILER} 
+  - cmake .. -DFORT_BUILD_TYPE=asan  
   - cmake --build . --target all 
   - ls
   - ./libfort_example
   - ./libfort_test
 
- # Build for coveralls
-  - if [ ${GCC_BUILD} == 'ON' ];
+  # Test build without optimizations and with ubsan
+  - cd ..
+  - rm -r build/*
+  - cd build
+  - cmake .. -DFORT_BUILD_TYPE=ubsan  
+  - cmake --build . --target all 
+  - ls
+  - ./libfort_example
+  - ./libfort_test
+
+  # Build for coveralls
+  - if [ ${FORT_COMPILER} == 'gcc' ];
     then
     cd ..  ;
     rm -r build/* ;
     cd build ;
-    cmake .. -DFORT_COVERALLS_BUILD=ON -DFORT_BUILD_TYPE=asan -DFORT_COMPILER=${FORT_COMPILER} ;
+    cmake .. -DFORT_BUILD_TYPE=coveralls ;
     cmake --build . --target all ;
     ls ;
     ./libfort_test ;
     fi
   - cd ..
 
+
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7afc734..9cbe261 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,14 +4,19 @@ project(libfort)
 cmake_minimum_required(VERSION 2.8)
 
 # Built options
-#option(FORT_GCC_BUILD "Build with gcc" ON)
-#option(FORT_MSVC_BUILD "Build with msvc" OFF)
 option(FORT_CXX_BUILD "Compile with c++ compiler instead of c" OFF)
-option(FORT_COVERALLS_BUILD "Build for coveralls" OFF)
-set(FORT_BUILD_TYPE "common" CACHE STRING "Built types (possible values: common, asan, ubsan, msan)")
-set(FORT_COMPILER "gcc" CACHE STRING "Compiler (possible values: gcc, clang, msvc)")
+#option(FORT_COVERALLS_BUILD "Build for coveralls" OFF)
+set(FORT_BUILD_TYPE "common" CACHE STRING "Built types (possible values: common, asan, ubsan, coveralls)")
+#set(FORT_COMPILER "gcc" CACHE STRING "Compiler (possible values: gcc, clang, msvc)")
 
 
+# Determine compiler (pos. values Clang, GNU, Intel, MSVC, AppleClang... (https://cmake.org/cmake/help/v3.0/variable/CMAKE_LANG_COMPILER_ID.html)
+if(FORT_CXX_BUILD)
+    set(FORT_COMPILER ${CMAKE_CXX_COMPILER_ID})
+else(FORT_CXX_BUILD)
+    set(FORT_COMPILER ${CMAKE_C_COMPILER_ID})
+endif(FORT_CXX_BUILD)
+
 
 
 set(CMAKE_VERBOSE_MAKEFILE ON)
@@ -21,18 +26,11 @@ include_directories(src)
 
 
 # Turn on warnings
-#if(FORT_MSVC_BUILD)
-#    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -W4")
-#else(FORT_MSVC_BUILD)
-#    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g")
-#endif(FORT_MSVC_BUILD)
-
-
-if(FORT_COMPILER STREQUAL "msvc")
+if(FORT_COMPILER STREQUAL "MSVC")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -W4")
-else(FORT_COMPILER STREQUAL "msvc")
+else(FORT_COMPILER STREQUAL "MSVC")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g")
-endif(FORT_COMPILER STREQUAL "msvc")
+endif(FORT_COMPILER STREQUAL "MSVC")
 
 
 
@@ -82,27 +80,35 @@ endif(FORT_CXX_BUILD)
 
 
 # Adding sanitizers
-if(FORT_COMPILER STREQUAL "gcc" OR FORT_COMPILER STREQUAL "clang")
+if(FORT_COMPILER STREQUAL "GNU" OR FORT_COMPILER STREQUAL "Clang")
+    # asan case
     if(FORT_BUILD_TYPE STREQUAL "asan")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address")
-        if(FORT_COMPILER STREQUAL "gcc")
+        if(FORT_COMPILER STREQUAL "GNU")
             target_link_libraries(${PROJECT_NAME}_example asan)
             target_link_libraries(${PROJECT_NAME}_test asan)
-        endif(FORT_COMPILER STREQUAL "gcc")
+        endif(FORT_COMPILER STREQUAL "GNU")
     endif(FORT_BUILD_TYPE STREQUAL "asan")
+
+    #ubsan case
     if(FORT_BUILD_TYPE STREQUAL "ubsan")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=undefined")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-sanitize-recover") #to force fail
-        if(FORT_COMPILER STREQUAL "gcc")
+        if(FORT_COMPILER STREQUAL "GNU")
             target_link_libraries(${PROJECT_NAME}_example ubsan)
             target_link_libraries(${PROJECT_NAME}_test ubsan)
-        endif(FORT_COMPILER STREQUAL "gcc")
+        endif(FORT_COMPILER STREQUAL "GNU")
     endif(FORT_BUILD_TYPE STREQUAL "ubsan")
 
-endif(FORT_COMPILER STREQUAL "gcc" OR FORT_COMPILER STREQUAL "clang")
+    #coveralls case
+    if(FORT_BUILD_TYPE STREQUAL "coveralls")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fprofile-arcs -ftest-coverage")
+    endif(FORT_BUILD_TYPE STREQUAL "coveralls")
+
+endif(FORT_COMPILER STREQUAL "GNU" OR FORT_COMPILER STREQUAL "Clang")
 
 
 # Coveralls support
-if(FORT_COVERALLS_BUILD)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fprofile-arcs -ftest-coverage")
-endif(FORT_COVERALLS_BUILD)
+#if(FORT_COVERALLS_BUILD)
+#    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fprofile-arcs -ftest-coverage")
+#endif(FORT_COVERALLS_BUILD)
diff --git a/appveyor.yml b/appveyor.yml
index 93c85ea..09922f1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,7 +14,7 @@ install:
 before_build:
   - mkdir build
   - cd build
-  - cmake -G "Visual Studio 15 2017 Win64" .. -DFORT_COMPILER=msvc
+  - cmake -G "Visual Studio 15 2017 Win64" .. 
   - dir
   
 build: