Skip to content

Commit

Permalink
modified file search
Browse files Browse the repository at this point in the history
  • Loading branch information
ct-clmsn committed Oct 5, 2023
1 parent d6c01ac commit 3e41ea6
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions cmake/HPX_SetupGasnet.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -151,25 +151,23 @@ macro(hpx_setup_gasnet)
"GASNet build result = ${GASNET_BUILD_STATUS} - see ${GASNET_BUILD_OUTPUT} for more details"
)
else()
set(CMAKE_PREFIX_PATH "${GASNET_DIR}/install/lib/pkgconfig")
set(ENV{PKG_CONFIG_PATH} "${GASNET_DIR}/install/lib/pkgconfig")

find_file(
GASNET_PKGCONFIG_FILE_FOUND
gasnet-${HPX_WITH_PARCELPORT_GASNET_CONDUIT}-par.pc
HINTS ${GASNET_DIR}/install/lib/pkgconfig
PATHS ${GASNET_DIR}/install/lib/pkgconfig
${GASNET_DIR}/install/lib/pkgconfig
)

if(NOT GASNET_PKGCONFIG_FILE_FOUND)
message(FATAL_ERROR "PKG-CONFIG ERROR (${GASNET_PKGCONFIG_FILE_FOUND}); CANNOT FIND COMPILED GASNET: ${GASNET_DIR}/install/lib/pkgconfig")
message(FATAL_ERROR "PKG-CONFIG ERROR (${GASNET_PKGCONFIG_FILE_FOUND}) -> CANNOT FIND COMPILED GASNET: ${GASNET_DIR}/install/lib/pkgconfig")
endif()

file(
READ
${GASNET_DIR}/install/lib/pkgconfig/gasnet-${HPX_WITH_PARCELPORT_GASNET_CONDUIT}-par.pc
GASNET_PKGCONFIG_FILE_CONTENT
)

if(NOT GASNET_PKGCONFIG_FILE_CONTENT)
message(FATAL_ERROR "ERROR INSTALLING GASNET")
endif()
Expand Down Expand Up @@ -212,7 +210,7 @@ macro(hpx_setup_gasnet)
GASNET_FILE_PATH
)

file(INSTALL ${GASNET_FILE_CACHED} DESTINATION ${GASNET_FILE_PATH})
file(COPY ${GASNET_FILE_CACHED} DESTINATION ${GASNET_FILE_PATH})
endforeach()
endif()

Expand Down

0 comments on commit 3e41ea6

Please sign in to comment.