From 5e36fa6bef58812b4d9f49e725fff73be3240674 Mon Sep 17 00:00:00 2001
From: "Kim, Jungwon" <kimj@orn.gov>
Date: Fri, 11 May 2018 14:31:02 -0500
Subject: [PATCH] fortran in grand tave

---
 build.sh                               | 4 ++--
 kv/src/CMakeLists.txt                  | 2 +-
 kv/tests/14_fortran/test14_fortran.f90 | 2 +-
 kv/tests/CMakeLists.txt                | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.sh b/build.sh
index 315b084..53c8d08 100755
--- a/build.sh
+++ b/build.sh
@@ -2,6 +2,6 @@
 rm -rf build install
 mkdir build
 cd build
-cmake .. -DCMAKE_INSTALL_PREFIX=../install -DMPIEXEC="/opt/intel/compilers_and_libraries_2017.4.196/linux/mpi/intel64/bin/mpirun" -DMPIEXEC_NUMPROC_FLAG="-n" -DPAPYRUS_USE_FORTRAN=ON # Stampede2
-#cmake .. -DCMAKE_INSTALL_PREFIX=../install -DMPIEXEC="/opt/slurm/default/bin/srun" -DMPIEXEC_NUMPROC_FLAG="-n" -DPAPYRUS_USE_FORTRAN=ON #Grand Tave
+#cmake .. -DCMAKE_INSTALL_PREFIX=../install -DMPIEXEC="/opt/intel/compilers_and_libraries_2017.4.196/linux/mpi/intel64/bin/mpirun" -DMPIEXEC_NUMPROC_FLAG="-n" -DPAPYRUS_USE_FORTRAN=ON # Stampede2
+cmake .. -DCMAKE_INSTALL_PREFIX=../install -DMPIEXEC="/opt/slurm/default/bin/srun" -DMPIEXEC_NUMPROC_FLAG="-n" -DPAPYRUS_USE_FORTRAN=ON #Grand Tave
 make -j install
diff --git a/kv/src/CMakeLists.txt b/kv/src/CMakeLists.txt
index 46eeb03..35e3b0d 100644
--- a/kv/src/CMakeLists.txt
+++ b/kv/src/CMakeLists.txt
@@ -33,5 +33,5 @@ add_library(papyruskv ${PAPYRUSKV_SOURCES})
 install(TARGETS papyruskv DESTINATION lib)
 
 if(PAPYRUS_USE_FORTRAN)
-   install(FILES papyrus.mod DESTINATION include)
+    install(FILES ${PROJECT_BINARY_DIR}/kv/src/papyrus.mod DESTINATION include)
 endif()
diff --git a/kv/tests/14_fortran/test14_fortran.f90 b/kv/tests/14_fortran/test14_fortran.f90
index 5576bd2..68be05e 100644
--- a/kv/tests/14_fortran/test14_fortran.f90
+++ b/kv/tests/14_fortran/test14_fortran.f90
@@ -11,7 +11,7 @@ PROGRAM TEST14_FORTRAN
     INTEGER(KIND=8) :: KEYLEN, VALLEN
 
     CALL MPI_INIT_THREAD(MPI_THREAD_MULTIPLE, PROVIDED, IERROR)
-    CALL MPI_BARRIER(MPI_COMM_WORLD, IERROR)
+    PRINT*, 'THIS IS A HACK CODE FOR PORTABILITY'
     CALL PAPYRUSKV_INIT('./pkv_repo', IERROR)
     IF (IERROR /= PAPYRUSKV_OK) THEN
         PRINT*, 'FAILED'
diff --git a/kv/tests/CMakeLists.txt b/kv/tests/CMakeLists.txt
index c74ceb7..da00eee 100644
--- a/kv/tests/CMakeLists.txt
+++ b/kv/tests/CMakeLists.txt
@@ -8,7 +8,7 @@ macro(papyruskv_test arg)
 endmacro(papyruskv_test)
 
 macro(papyruskv_test_fortran arg)
-    include_directories(${PROJECT_SOURCE_DIR}/kv/src)
+    include_directories(${PROJECT_BINARY_DIR}/kv/src)
     add_executable(kv.${arg} ${arg}.f90)
     target_link_libraries(kv.${arg} papyruskv pthread stdc++)
     add_test(kv.${arg} ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ./kv.${arg})
-- 
GitLab