Skip to content

Commit b3ba2e5

Browse files
author
Damian Rouson
committed
Adding the buildgcc and buildmpich scripts to the installation directory.
Signed-off-by: Damian Rouson <[email protected]>
1 parent da16252 commit b3ba2e5

File tree

3 files changed

+22
-1
lines changed

3 files changed

+22
-1
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ CHECK_Fortran_SOURCE_COMPILES("
7373
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src)
7474

7575
add_subdirectory(src)
76+
add_subdirectory(install_prerequisites)
7677

7778
install(EXPORT OpenCoarraysTargets
7879
NAMESPACE
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Write the script that builds GCC from source
2+
set(exe_dir ${CMAKE_BINARY_DIR}/bin_staging)
3+
set(gcc_build_script ${exe_dir}/buildgcc)
4+
install(
5+
FILES "${gcc_build_script}"
6+
PERMISSIONS WORLD_EXECUTE WORLD_READ WORLD_WRITE OWNER_EXECUTE OWNER_READ OWNER_WRITE GROUP_EXECUTE GROUP_READ GROUP_WRITE
7+
DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
8+
)
9+
file(READ ${CMAKE_CURRENT_SOURCE_DIR}/buildgcc BUILDGCC_SCRIPT)
10+
file(WRITE "${gcc_build_script}" "${BUILDGCC_SCRIPT}\n")
11+
12+
# Write the script that builds MPICH from source
13+
set(mpich_build_script ${exe_dir}/buildmpich)
14+
install(
15+
FILES "${mpich_build_script}"
16+
PERMISSIONS WORLD_EXECUTE WORLD_READ WORLD_WRITE OWNER_EXECUTE OWNER_READ OWNER_WRITE GROUP_EXECUTE GROUP_READ GROUP_WRITE
17+
DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
18+
)
19+
file(READ ${CMAKE_CURRENT_SOURCE_DIR}/buildmpich BUILDMPICH_SCRIPT)
20+
file(WRITE "${mpich_build_script}" "${BUILDMPICH_SCRIPT}\n")

src/mpi/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ install(TARGETS caf_mpi EXPORT OpenCoarraysTargets
5151
)
5252
install(DIRECTORY ${CMAKE_BINARY_DIR}/mod DESTINATION .)
5353

54-
set(compiler_wrapper ${CMAKE_BINARY_DIR}/exe/caf)
5554
set(exe_dir ${CMAKE_BINARY_DIR}/bin_staging)
55+
set(compiler_wrapper ${exe_dir}/caf)
5656
install(
5757
FILES "${compiler_wrapper}"
5858
PERMISSIONS WORLD_EXECUTE WORLD_READ WORLD_WRITE OWNER_EXECUTE OWNER_READ OWNER_WRITE GROUP_EXECUTE GROUP_READ GROUP_WRITE

0 commit comments

Comments
 (0)