Skip to content

Commit 2b3d1fd

Browse files
committed
fixed MPAS compile issues
1 parent 46b7ca4 commit 2b3d1fd

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ git clone -b 4.1.00 https://github.com/kokkos/kokkos.git
580580
mkdir -p $kk
581581
cmake -S kokkos -B ${kk%%install} \
582582
-DCMAKE_INSTALL_PREFIX=$kk \
583-
-DCMAKE_CXX_COMPILER=g++ \
583+
-DCMAKE_CXX_COMPILER=CC \
584584
-DKokkos_ENABLE_SERIAL=ON \
585585
-DKokkos_ENABLE_OPENMP=off \
586586
-DKokkos_ENABLE_CUDA=off \
@@ -593,8 +593,8 @@ git clone https://github.com/SCOREC/EnGPar.git
593593
cmake -S EnGPar -B ${engpar%%install} \
594594
-DCMAKE_INSTALL_PREFIX=$engpar \
595595
-DCMAKE_BUILD_TYPE="Release" \
596-
-DCMAKE_C_COMPILER="mpicc" \
597-
-DCMAKE_CXX_COMPILER="mpicxx" \
596+
-DCMAKE_C_COMPILER=cc \
597+
-DCMAKE_CXX_COMPILER=CC \
598598
-DCMAKE_CXX_FLAGS="-std=c++11" \
599599
-DENABLE_PARMETIS=OFF \
600600
-DENABLE_PUMI=OFF \
@@ -612,8 +612,8 @@ cmake -S omega_h -B ${oh%%install} \
612612
-DOmega_h_USE_CUDA=off \
613613
-DOmega_h_USE_MPI=on \
614614
-DBUILD_TESTING=off \
615-
-DCMAKE_C_COMPILER=`which mpicc` \
616-
-DCMAKE_CXX_COMPILER=`which mpicxx` \
615+
-DCMAKE_C_COMPILER=cc \
616+
-DCMAKE_CXX_COMPILER=CC \
617617
-DKokkos_PREFIX=$kk/lib64/cmake
618618
cmake --build ${oh%%install} -j 24 --target install
619619
@@ -623,7 +623,7 @@ git clone -b 0.6.1 https://github.com/ECP-copa/Cabana.git cabana
623623
cmake -S cabana -B ${cab%%install} \
624624
-DCMAKE_INSTALL_PREFIX=$cab \
625625
-DCMAKE_BUILD_TYPE="Release" \
626-
-DCMAKE_CXX_COMPILER=`which mpicxx` \
626+
-DCMAKE_CXX_COMPILER=CC \
627627
-DCabana_ENABLE_TESTING=OFF \
628628
-DCabana_ENABLE_EXAMPLES=OFF
629629
cmake --build ${cab%%install} -j 24 --target install
@@ -634,7 +634,7 @@ git clone -b 2.0.3 --recursive https://github.com/SCOREC/pumi-pic.git
634634
cmake -S pumi-pic -B ${pumipic%%install} \
635635
-DCMAKE_INSTALL_PREFIX=$pumipic \
636636
-DCMAKE_BUILD_TYPE="Debug" \
637-
-DCMAKE_CXX_COMPILER=mpicxx \
637+
-DCMAKE_CXX_COMPILER=CC \
638638
-DENABLE_CABANA=ON \
639639
-DTEST_DATA_DIR=$root/pumi-pic/pumipic-data \
640640
-DOmega_h_PREFIX=$oh \
@@ -650,7 +650,7 @@ cmake --build ${pumipic%%install} -j 24 --target install
650650
cmake -S polyMPO -B ${polyMPO%%install} \
651651
-DCMAKE_BUILD_TYPE=Debug \
652652
-DKokkos_DIR=$kk/lib64/cmake/Kokkos \
653-
-DCMAKE_CXX_COMPILER=mpicxx \
653+
-DCMAKE_CXX_COMPILER=CC \
654654
-DIS_TESTING=off \
655655
-DCMAKE_INSTALL_PREFIX=$polyMPO
656656
```

src/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ target_link_libraries(polyMPO-core PUBLIC pumipic::pumipic)
4040

4141
polyMPO_export_lib(polyMPO-core "${HEADERS}")
4242

43-
add_library(polyMPO INTERFACE)
44-
target_link_libraries(polyMPO INTERFACE ${polyMPO_EXPORTED_TARGETS})
45-
bob_export_target(polyMPO)
46-
4743
### Fortran inteface ###
4844
add_library(polympo_fortran pmpo_fortran.f90)
4945
target_link_libraries(polympo_fortran PUBLIC MPI::MPI_Fortran)
@@ -53,4 +49,8 @@ target_include_directories(polympo_fortran INTERFACE
5349
set(HEADERS)
5450
polyMPO_export_lib(polympo_fortran "${HEADERS}")
5551

52+
add_library(polyMPO INTERFACE)
53+
target_link_libraries(polyMPO INTERFACE ${polyMPO_EXPORTED_TARGETS})
54+
bob_export_target(polyMPO)
55+
5656
bob_end_subdir()

0 commit comments

Comments
 (0)