Merge pull request #557 from sourceryinstitute/clang-isofortran-workaround

Don't compile ISO_Fortran_binding unless GCC

 - Fixes #554

Author: zbeekman

CMakeLists.txt

@@ -78,6 +78,7 @@ endif()
 string(REGEX REPLACE "-rc[0-9]+$"
        ".0" OPENCOARRAYS_CMAKE_PROJECT_VERSION
        "${OpenCoarraysVersion}")
+
 project(opencoarrays VERSION "${OPENCOARRAYS_CMAKE_PROJECT_VERSION}" LANGUAGES C Fortran)
 message( STATUS "Building OpenCoarrays version: ${full_git_describe}" )
 set(OpenCoarrays_dist_string "OpenCoarrays-${full_git_describe}")
@@ -645,7 +646,12 @@ if(opencoarrays_aware_compiler)
   add_caf_test(register_vector 2 register_vector)
   add_caf_test(register_alloc_vector 2 register_alloc_vector)
   add_caf_test(allocate_as_barrier 2 allocate_as_barrier)
-  add_caf_test(allocate_as_barrier_proc 8 allocate_as_barrier_proc)
+  if(gfortran_compiler AND (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0.0) OR (CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER}))
+    if( CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0.0 )
+      message( AUTHOR_WARNING "Developer tests requested and GFortran < 7: test allocate_as_barrier_proc may fail" )
+    endif()
+    add_caf_test(allocate_as_barrier_proc 8 allocate_as_barrier_proc)
+  endif()
   if (gfortran_compiler AND (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0.0) OR (CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER}))
     message( STATUS "Allocatable components of coarray derived types only supported in GFortran >= 7 with OpenCoarrays > 1.8.4" )
     message( STATUS "(but full support not anticipated until OpenCoarrays 2.0 release)" )
@@ -832,7 +838,9 @@ include(cmake/AddInstallationScriptTest.cmake )
 add_installation_script_test(installation-scripts.sh src/tests/installation/)
 
 # Test ISO_Fortran_binding library
-add_test(NAME ISO_Fortran_binding_tests COMMAND "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ISO_Fortran_binding_tests")
+if( "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" )
+  add_test(NAME ISO_Fortran_binding_tests COMMAND "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ISO_Fortran_binding_tests")
+endif()
 
 # Lint the Travis-CI scripts
 set(TRAVIS_SCRIPTS

src/CMakeLists.txt

@@ -1,4 +1,9 @@
-set(directories_to_build mpi tests iso-fortran-binding)
+set(directories_to_build mpi tests)
+
+if( "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" )
+  LIST( APPEND directories_to_build iso-fortran-binding )
+endif()
+
 foreach(directory ${directories_to_build})
   add_subdirectory(${directory})
 endforeach()

src/iso-fortran-binding/ISO_Fortran_binding.c

@@ -2,8 +2,8 @@
    OpenCoarrays is distributed under the OSI-approved BSD 3-clause License:
    OpenCoarrays -- ISO_Fortran_binding standard-compliant interoperability with
    C.
-   Copyright (c) 2015, Sourcery, Inc.
-   Copyright (c) 2015, Sourcery Institute
+   Copyright (c) 2018, Sourcery, Inc.
+   Copyright (c) 2018, Sourcery Institute
    All rights reserved.
 
    Redistribution and use in source and binary forms, with or without

src/iso-fortran-binding/ISO_Fortran_binding.h

@@ -1,17 +1,37 @@
 /*
    OpenCoarrays is distributed under the OSI-approved BSD 3-clause License:
    OpenCoarrays -- ISO_Fortran_binding standard-compliant interoperability with C.
-   Copyright (c) 2015, Sourcery, Inc.
-   Copyright (c) 2015, Sourcery Institute
+   Copyright (c) 2018, Sourcery, Inc.
+   Copyright (c) 2018, Sourcery Institute
    All rights reserved.
 
-   Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-   1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-   2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-   3. Neither the names of the copyright holders nor the names of their contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+   2. Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+   3. Neither the names of the copyright holders nor the names of
+      their contributors may be used to endorse or promote products
+      derived from this software without specific prior written
+      permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+   COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+   HnnnOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+   OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef ISO_FORTRAN_BINDING_H

src/tests/unit/iso-fortran-binding/ISO_Fortran_binding_tests.c

@@ -2,8 +2,8 @@
    OpenCoarrays is distributed under the OSI-approved BSD 3-clause License:
    OpenCoarrays -- ISO_Fortran_binding standard-compliant interoperability with
    C.
-   Copyright (c) 2015, Sourcery, Inc.
-   Copyright (c) 2015, Sourcery Institute
+   Copyright (c) 2018, Sourcery, Inc.
+   Copyright (c) 2018, Sourcery Institute
    All rights reserved.
 
    Redistribution and use in source and binary forms, with or without