Merge pull request #102 from isuruf/appveyor

Test install in appveyor

Author: isuruf

.appveyor.yml

@@ -30,9 +30,8 @@ build_script:
   - cd build
   - set "PATH=%cd%\bin;%PATH%"
   - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
-
+  - cmake -G "Ninja" -DCMAKE_INSTALL_PREFIX=%CONDA_PREFIX% -DFLANG_INCLUDE_TESTS=ON -DFLANG_TEST_VERBOSE_MODE=ON -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_Fortran_COMPILER=flang -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=Release -DLLVM_INCLUDE_TESTS=ON -DLLVM_MAIN_SRC_DIR=C:\llvm_src ..
   - ps: |
-      cmake -G "Ninja" -DFLANG_INCLUDE_TESTS=ON -DFLANG_TEST_VERBOSE_MODE=ON -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_Fortran_COMPILER=flang -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=Release -DLLVM_INCLUDE_TESTS=ON -DLLVM_MAIN_SRC_DIR=C:\llvm_src ..
       Push-AppveyorArtifact .\CMakeFiles\CMakeOutput.log
       Push-AppveyorArtifact .\CMakeFiles\CMakeError.log
 
@@ -48,7 +47,4 @@ build_script:
   - ps: Push-AppveyorArtifact C:\Projects\flang\lib.zip
 
 test_script:
-  - cmd: copy lib\flangmain.lib %CONDA_INSTALL_LOCN%\Library\lib
-  - cmd: copy lib\flangrti.lib %CONDA_INSTALL_LOCN%\Library\lib
-  - cmd: copy lib\flang.lib %CONDA_INSTALL_LOCN%\Library\lib
-  - cmd: copy lib\ompstub.lib %CONDA_INSTALL_LOCN%\Library\lib
+  - cmd: cmake --build . --target install

CMakeLists.txt

@@ -25,6 +25,7 @@ SET(CMAKE_Fortran_ABI_COMPILED 0)
 SET(CMAKE_Fortran_COMPILER_SUPPORTS_F90 1)
 SET(CMAKE_Fortran_PREPROCESS_SOURCE
     "<CMAKE_Fortran_COMPILER> -cpp <DEFINES> <INCLUDES> <FLAGS> -E <SOURCE> -o <PREPROCESSED_SOURCE>")
+SET(CMAKE_Fortran_MODDIR_FLAG "-module ")
 
 # If we are not building as a part of LLVM, build Flang as an
 # standalone project, using LLVM as an external library:
@@ -360,13 +361,15 @@ include_directories(BEFORE
   )
 
 # Direct module files to build include directory
-set(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/runtime/flang)
+set(FLANG_MODULE_DIRECTORY_SHARED ${CMAKE_CURRENT_BINARY_DIR}/include)
+# mod files in the following differs only by the timestamp. This is needed to
+# ensure that flang can be built parallelly. It is discarded after flang is built
+set(FLANG_MODULE_DIRECTORY_STATIC ${CMAKE_CURRENT_BINARY_DIR}/include-static)
 
 # Install Fortran module files
-install(
-    CODE "file(GLOB FLANG_MOD_FILES \"${CMAKE_Fortran_MODULE_DIRECTORY}/*.mod\")"
-    CODE "file(INSTALL \${FLANG_MOD_FILES} DESTINATION \"${CMAKE_INSTALL_PREFIX}/include\")"
-)
+install(DIRECTORY ${FLANG_MODULE_DIRECTORY_SHARED}/
+  DESTINATION include
+  )
 
 # Install Fortran OpenMP include file
 # Copy omp_lib.h file, not the symlink

runtime/flang/CMakeLists.txt

@@ -25,7 +25,10 @@ endif()
 # We are using Fortran driver to build this library with fresh compiler
 # components, so point its binary directory to the build directory to pick up
 # flang* executables
-SET(CMAKE_Fortran_FLAGS "-B ${LLVM_RUNTIME_OUTPUT_INTDIR} ${CMAKE_Fortran_FLAGS} -no-flang-libs")
+SET(CMAKE_Fortran_FLAGS "-B ${LLVM_RUNTIME_OUTPUT_INTDIR} ${CMAKE_Fortran_FLAGS}")
+
+# flang runtime libraries are being built here. Don't link them
+SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -no-flang-libs")
 
 SET(FTN_INTRINSICS
   abort3f.c
@@ -270,7 +273,7 @@ SET(FTN_INTRINSICS
   wait3f.c
   )
 
-SET(FTN_SUPPORT
+SET(FTN_SUPPORT_COMMON
   bcopy.c
   bcopys.c
   buffer.c
@@ -335,12 +338,9 @@ SET(FTN_SUPPORT
   descIntrins.c
   descFioUtil.c
   descRW.c
-  ieee_arithmetic.F95
-  ieee_exceptions.F95
   ieee_features.F95
   initpar.c
   inquire.c
-  iso_c_bind.F95
   iso_fortran_env.f90
   ldread.c
   ldwrite.c
@@ -477,18 +477,32 @@ SET(FTN_SUPPORT
   xfer_rpm1.c
   )
 
-add_library(iso_c_bind OBJECT
-  iso_c_bind.F95
-)
+foreach(FTN_FILE ieee_arithmetic ieee_exceptions iso_c_bind)
+  configure_file(${FTN_FILE}.F95 ${FTN_FILE}_static.F95 COPYONLY)
+endforeach()
 
-add_library(ieee_arithmetic OBJECT
+SET(FTN_SUPPORT_SHARED
   ieee_arithmetic.F95
   ieee_exceptions.F95
+  iso_c_bind.F95
+)
+
+SET(FTN_SUPPORT_STATIC
+  ieee_arithmetic_static.F95
+  ieee_exceptions_static.F95
+  iso_c_bind_static.F95
+)
+
+SET(FTN_SUPPORT
+  ${FTN_SUPPORT_STATIC}
+  ${FTN_SUPPORT_SHARED}
+  ${FTN_SUPPORT_COMMON}
 )
 
 add_flang_library(flang_static
   ${FTN_INTRINSICS}
-  ${FTN_SUPPORT}
+  ${FTN_SUPPORT_COMMON}
+  ${FTN_SUPPORT_STATIC}
   ${SHARED_SOURCES}
   )
 
@@ -498,21 +512,81 @@ else()
   set_property(TARGET flang_static PROPERTY OUTPUT_NAME flang)
 endif()
 
+set_target_properties(flang_static PROPERTIES Fortran_MODULE_DIRECTORY ${FLANG_MODULE_DIRECTORY_STATIC})
+
+if (NOT "${CMAKE_GENERATOR}" STREQUAL "Ninja")
+# State the module that the source is producing
+set_source_files_properties(
+  iso_c_bind_static.F95
+  PROPERTIES
+  OBJECT_OUTPUTS ${FLANG_MODULE_DIRECTORY_STATIC}/iso_c_binding.mod
+  )
+
+# State a dependency on the module
+set_source_files_properties(
+  ieee_arithmetic_static.F95
+  ieee_exceptions_static.F95
+  PROPERTIES
+  OBJECT_DEPENDS ${FLANG_MODULE_DIRECTORY_STATIC}/iso_c_binding.mod
+  )
+else()
+add_library(iso_c_bind OBJECT
+  iso_c_bind.F95
+)
+add_library(ieee_arithmetic OBJECT
+  ieee_arithmetic.F95
+  ieee_exceptions.F95
+)
+add_dependencies(iso_c_bind
+  flang1
+  flang2
+)
+add_dependencies(ieee_arithmetic
+  iso_c_bind
+)
+add_dependencies(flang_static
+  ieee_arithmetic
+)
+endif()
+
 set(SHARED_LIBRARY TRUE)
+
 add_flang_library(flang_shared
   ${FTN_INTRINSICS}
-  ${FTN_SUPPORT}
+  ${FTN_SUPPORT_COMMON}
+  ${FTN_SUPPORT_SHARED}
   ${SHARED_SOURCES}
   )
 set_property(TARGET flang_shared PROPERTY OUTPUT_NAME flang)
 target_link_libraries(flang_shared flangrti_shared)
 # Resolve symbols against libm and librt
 if (NOT MSVC)
-target_link_libraries(flang_shared rt m)
+  target_link_libraries(flang_shared rt m)
 else()
   set_target_properties(flang_shared PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
 endif()
+set_target_properties(flang_shared PROPERTIES Fortran_MODULE_DIRECTORY ${FLANG_MODULE_DIRECTORY_SHARED})
+
+if (NOT "${CMAKE_GENERATOR}" STREQUAL "Ninja")
+# State the module that the source is producing
+set_source_files_properties(
+  iso_c_bind.F95
+  PROPERTIES
+  OBJECT_OUTPUTS ${FLANG_MODULE_DIRECTORY_SHARED}/iso_c_binding.mod
+  )
 
+# State a dependency on the module
+set_source_files_properties(
+  ieee_arithmetic.F95
+  ieee_exceptions.F95
+  PROPERTIES
+  OBJECT_DEPENDS ${FLANG_MODULE_DIRECTORY_SHARED}/iso_c_binding.mod
+  )
+else()
+add_dependencies(flang_shared
+  ieee_arithmetic
+)
+endif()
 set(SHARED_LIBRARY FALSE)
 
 set_property(
@@ -576,25 +650,14 @@ target_include_directories(flang_shared
 add_dependencies(flang_static 
   flang1
   flang2
-  ieee_arithmetic
   )
 
 # Make sure the compiler is built before we bootstrap
 add_dependencies(flang_shared 
   flang1
   flang2
-  ieee_arithmetic
   )
 
-add_dependencies(iso_c_bind
-  flang1
-  flang2
-)
-
-add_dependencies(ieee_arithmetic
-  iso_c_bind
-)
-
 if (NOT MSVC)
   target_compile_options(flang_static PRIVATE -fPIC)
   target_compile_options(flang_shared PRIVATE -fPIC)