cmake flang

Author: scivision

.appveyor.yml

@@ -7,7 +7,6 @@ stack: python 3
 environment:
   MINGW_DIR: C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin
   PY_DIR: C:\Python36-x64
-  TRAVIS: 1
 
 clone_depth: 3
 
@@ -18,6 +17,7 @@ before_build:
 - cmd: set FC=%MINGW_DIR%\gfortran 
 - cmd: set CXX=%MINGW_DIR%\g++ 
 - cmd: set CC=%MINGW_DIR%\gcc
+- cmd: mklink bin\make.exe %MINGW_DIR%\mingw32-make.exe
 
 - sh: sudo apt -yq update > /dev/null
 - sh: sudo apt install -yq --no-install-suggests --no-install-recommends gfortran cmake make > /dev/null
@@ -26,15 +26,15 @@ before_build:
 
 build_script:
 - cmd: cmake -G "MinGW Makefiles" ..
-- cmd: mingw32-make
-
 - sh: cmake ..
-- sh: make
+
+- make
 
 - cd ..
 - cmd: where python
 - pip -q install -e .[tests]
 
 after_build:
+- make test
 - pytest -v
 

CMakeLists.txt

@@ -1,9 +1,10 @@
-cmake_minimum_required(VERSION 2.8.12)
-project( morecvutils Fortran )
+cmake_minimum_required(VERSION 3.0)
+project(lineclip Fortran)
+enable_testing()
 
 add_compile_options(-O3 -mtune=native -g)
 
-if(${CMAKE_Fortran_COMPILER_ID} MATCHES "GNU")
+if(${CMAKE_Fortran_COMPILER_ID} STREQUAL GNU)
   add_compile_options(-Wall -Wextra -Wpedantic -Werror=array-bounds -fbacktrace -fexceptions)
   if(NOT CYGWIN AND NOT WIN32)
     add_compile_options(-fstack-protector-all)
@@ -13,18 +14,24 @@ endif()
 
 if(${CMAKE_Fortran_COMPILER_ID} STREQUAL Intel)
     add_compile_options(-coarray=shared)# -check all)
-    link_libraries(-coarray=shared) # seems silly but that's what's needed at object code step for ifort
+    link_libraries(-coarray=shared)
 elseif(${CMAKE_Fortran_COMPILER_ID} STREQUAL GNU)
-  if ($ENV{TRAVIS}) # on Travis-CI
-    add_compile_options(-fcoarray=single)
-  else()
+  find_package(OpenCoarrays)
+  
+  if(OpenCoarrays_FOUND)
     add_compile_options(-fcoarray=lib)
-    set(FCAF ${FCAF} caf_mpi)
+    link_libraries(caf_mpi)
+  else()
+    add_compile_options(-fcoarray=single)
   endif()
+elseif(${CMAKE_Fortran_COMPILER_ID} STREQUAL Flang)
+  link_libraries(-static-flang-libs)
 endif()
 
 add_library(lineclip lineclipping.f90)
-target_link_libraries(lineclip ${FCAF})
+target_link_libraries(lineclip)
 
 add_executable(RunLineclip DemoLineclip.f90 assert.f90)
 target_link_libraries(RunLineclip lineclip)
+
+add_test(NAME clip COMMAND ./RunLineclip)