Merge branch '551-c-build-failure' into 'development'

make compatible with older CMake

Closes #551

See merge request damask/DAMASK!1133

Author: Javier Velo

CMakeLists.txt

@@ -49,7 +49,7 @@ if(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL ${CMAKE_Fortran_COMPILER_ID})
   message(FATAL_ERROR "C++ compiler (${CMAKE_CXX_COMPILER_ID}) does not match Fortran compiler (${CMAKE_Fortran_COMPILER_ID})")
 endif()
 
-add_compile_definitions("-D${DAMASK_SOLVER_UPPER}")
+add_compile_definitions("${DAMASK_SOLVER_UPPER}")
 
 set(CMAKE_Fortran_PREPROCESS "ON")
 
@@ -66,20 +66,20 @@ endif()
 
 message("\nBuilding ${CMAKE_PROJECT_NAME} ${DAMASK_VERSION_STRING}\n")
 
-add_compile_definitions(-DPETSC)
-add_compile_definitions(-DDAMASK_VERSION="${DAMASK_VERSION_STRING}")
-add_compile_definitions(-DDAMASK_VERSION_MAJOR="${PROJECT_VERSION_MAJOR}")
-add_compile_definitions(-DDAMASK_VERSION_MINOR="${PROJECT_VERSION_MINOR}")
-add_compile_definitions(-DDAMASK_VERSION_PATCH="${PROJECT_VERSION_PATCH}")
+add_compile_definitions(PETSC)
+add_compile_definitions(DAMASK_VERSION="${DAMASK_VERSION_STRING}")
+add_compile_definitions(DAMASK_VERSION_MAJOR="${PROJECT_VERSION_MAJOR}")
+add_compile_definitions(DAMASK_VERSION_MINOR="${PROJECT_VERSION_MINOR}")
+add_compile_definitions(DAMASK_VERSION_PATCH="${PROJECT_VERSION_PATCH}")
 if(DEFINED PROJECT_VERSION_HASH)
-  add_compile_definitions(-DDAMASK_VERSION_HASH="${PROJECT_VERSION_HASH}")
+  add_compile_definitions(DAMASK_VERSION_HASH="${PROJECT_VERSION_HASH}")
 endif()
 
-add_compile_definitions(-DCMAKE_SYSTEM_NAME="${CMAKE_SYSTEM_NAME}")
-add_compile_definitions(-DCMAKE_SYSTEM_PROCESSOR="${CMAKE_SYSTEM_PROCESSOR}")
+add_compile_definitions(CMAKE_SYSTEM_NAME="${CMAKE_SYSTEM_NAME}")
+add_compile_definitions(CMAKE_SYSTEM_PROCESSOR="${CMAKE_SYSTEM_PROCESSOR}")
 
 if(PETSC_VERSION VERSION_EQUAL 3.17.0)
-  add_compile_definitions("-DCHKERRQ=PetscCall")
+  add_compile_definitions("CHKERRQ=PetscCall")
 endif()
 if(PETSC_VERSION VERSION_LESS 3.23.0)
   add_compile_definitions(
@@ -195,7 +195,7 @@ if(fYAML_FOUND STREQUAL "1")
   foreach(fYAML_LIBRARY ${fYAML_LIBRARIES})
     set(CMAKE_Fortran_LINK_EXECUTABLE "${CMAKE_Fortran_LINK_EXECUTABLE} -L${fYAML_LIBRARY_DIRS} -l${fYAML_LIBRARY}")
   endforeach()
-  add_compile_definitions(-DFYAML)
+  add_compile_definitions(FYAML)
   pkg_get_variable(fYAML_INCLUDE_DIR libfyaml includedir) # fYAML_INCLUDE_DIRS and fYAML_CFLAGS are not working
   set(CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE} "${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}} -I${fYAML_INCLUDE_DIR}")
 endif()

src/CLI.f90

@@ -9,7 +9,7 @@
 #define PETSC_MINOR_MAX 23
 
 module CLI
-  use, intrinsic :: ISO_fortran_env
+  use, intrinsic :: ISO_Fortran_env
   use, intrinsic :: ISO_C_binding
 
   use PETScSys
@@ -31,7 +31,7 @@ module CLI
     CLI_jobName, &                                                                                  !< name of the job (will be used for DADF5 result file)
     CLI_jobID                                                                                       !< unique job ID (UUID)
 
-#ifdef BOOST
+#if (defined(BOOST) && !defined(OLD_STYLE_C_TO_FORTRAN_STRING))
    type :: tCLIBuffer
       character(len=:, kind=C_CHAR), pointer :: buf
    end type tCLIBuffer
@@ -46,7 +46,7 @@ module CLI
 
 interface
   function C_CLI__new(argc, argv, worldrank) result(this) bind(C, name='CLI__new')
-    use, intrinsic :: iso_c_binding, only: C_INT, C_PTR
+    use, intrinsic :: ISO_C_binding, only: C_INT, C_PTR
     integer(C_INT), intent(in) :: argc
     type(C_PTR),    intent(in) :: argv(*) ! MD I think this should be dimension(:), but wait for working ifx
     integer(C_INT), intent(in) :: worldrank
@@ -55,7 +55,7 @@ end function C_CLI__new
 
   subroutine C_CLI_getParsedArgs(cli, geom, load, material, numerics, jobname, uuid, restart, stat) &
       bind(C, name='CLI_getParsedArgs')
-    use iso_c_binding
+    use ISO_C_binding
     type(C_PTR), value :: cli
     character(kind=C_CHAR,len=:), allocatable, intent(out) :: geom, load, material, numerics, jobname, uuid
     integer(C_INT), intent(out) :: restart, stat
@@ -106,15 +106,15 @@ subroutine CLI_init()
 #ifdef PETSC_DOI
   character(len=*), parameter :: PETSc_DOI = PETSC_DOI
 #endif
-#ifdef BOOST
+#if (defined(BOOST) && !defined(OLD_STYLE_C_TO_FORTRAN_STRING))
   type(C_PTR) :: CLI_ = C_NULL_PTR
   type(tCLIArgs) :: cliArgs
   integer(C_INT) :: stat
 #endif
 
   print'(/,1x,a)', '<<<+-  CLI init  -+>>>'
 
-#ifdef BOOST
+#if (defined(BOOST) && !defined(OLD_STYLE_C_TO_FORTRAN_STRING))
   print'(a)', 'Using boost, experimental C++ feature'
 
   call cliArgs%copyCommandLineArgs()
@@ -242,7 +242,7 @@ subroutine CLI_init()
   if (allocated(numericsArg)) &
     print'(1x,a)',      'Numerics config:    '//IO_glueDiffering(CLI_numericsFile,numericsArg)
   print'(1x,a)',        'Job name:           '//CLI_jobName
-#ifdef BOOST
+#if (defined(BOOST) && !defined(OLD_STYLE_C_TO_FORTRAN_STRING))
   print'(1x,a)',        'Job ID:             '//CLI_jobID
 #endif
   if (CLI_restartInc > 0) &
@@ -314,7 +314,7 @@ subroutine printCompileOptions() bind(C, name="F_printCompileOptions")
 
 end subroutine printCompileOptions
 
-#ifdef BOOST
+#if (defined(BOOST) && !defined(OLD_STYLE_C_TO_FORTRAN_STRING))
 !--------------------------------------------------------------------------------------------------
 !> @brief Copy command line args to c strings for boost-processing,
 !         allocate one extra element for the NULL termination.