Skip to content

Commit 143c0c1

Browse files
committed
Added "make clean" step to the installation script to remove the file that gets written into the source tree during building. Also added missing qoutations in the definition link arguments in the caf compiler wrapper to fix a bug that preventing using caf on Linux.
1 parent 8adfe67 commit 143c0c1

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

install.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,9 @@ else
178178
mkdir -p opencoarrays-build &&
179179
cd opencoarrays-build &&
180180
CC=$MPICC FC=$MPIFC cmake .. -DCMAKE_INSTALL_PREFIX=$install_path &&
181-
make &&
182-
make install
181+
make &&
182+
make install &&
183+
make clean
183184
} >&1 | tee $installation_record
184185

185186
# Report installation success or failure

src/mpi/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ file(APPEND "${compiler_wrapper}" "caf_mod_dir=${CMAKE_INSTALL_PREFIX}/mod\n")
6060
file(APPEND "${compiler_wrapper}" "caf_lib_dir=${CMAKE_INSTALL_PREFIX}/lib\n")
6161
file(APPEND "${compiler_wrapper}" "caf_version=${PROJECT_VERSION}\n")
6262
if(gfortran_compiler)
63-
file(APPEND "${compiler_wrapper}" "link_args=-fcoarray=lib -lcaf_mpi\n")
63+
file(APPEND "${compiler_wrapper}" "link_args='-fcoarray=lib -lcaf_mpi'\n")
6464
elseif(portland_group_compiler)
6565
file(APPEND "${compiler_wrapper}" "link_args=-lcaf_mpi\n")
6666
endif()

0 commit comments

Comments
 (0)