From 29afacf2e187dc1fdd866dfcf683173384d9c43f Mon Sep 17 00:00:00 2001 From: David A Minton Date: Thu, 18 May 2023 10:50:02 -0400 Subject: [PATCH] Changed how coarray preprocessor variable is defined to use the older CMAKE TARGET_COMPILE_DEFINITIONS instead of the newer ADD_DEFINITIONS --- CMakeLists.txt | 4 ---- src/CMakeLists.txt | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a9ed99c0..0aed20380 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,10 +31,6 @@ ENDIF(NOT CMAKE_Fortran_COMPILER_SUPPORTS_F90) OPTION(USE_COARRAY "Use Coarray Fortran for parallelization of test particles" OFF) OPTION(USE_OPENMP "Use OpenMP for parallelization" ON) -IF (USE_COARRAY) - ADD_DEFINITIONS(-DCOARRAY) -ENDIF() - # Locate and set parallelization libraries. There are some CMake peculiarities # taken care of here, such as the fact that the FindOpenMP routine doesn't know # about Fortran. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a0ae5a554..4d731373d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -111,6 +111,8 @@ SET_SOURCE_FILES_PROPERTIES(${SWIFTEST_src} PROPERTIES Fortran_PREPROCESS ON) # # Uncomment if you need to link to BLAS and LAPACK TARGET_LINK_LIBRARIES(${SWIFTEST_DRIVER} ${NETCDF_LIBRARIES} ${NETCDF_FORTRAN_LIBRARIES}) + + IF(USE_OPENMP) SET_TARGET_PROPERTIES(${SWIFTEST_DRIVER} PROPERTIES COMPILE_FLAGS "${OpenMP_Fortran_FLAGS}" @@ -118,6 +120,7 @@ IF(USE_OPENMP) ENDIF(USE_OPENMP) IF(USE_COARRAY) + TARGET_COMPILE_DEFINITIONS(${SWIFTEST_DRIVER} PRIVATE -DCOARRAY) SET_TARGET_PROPERTIES(${SWIFTEST_DRIVER} PROPERTIES COMPILE_FLAGS "${Coarray_Fortran_FLAGS}" LINK_FLAGS "${Coarray_Fortran_FLAGS}")