Skip to content

Commit

Permalink
cmake formatting updates
Browse files Browse the repository at this point in the history
  • Loading branch information
ct-clmsn committed Oct 27, 2023
1 parent 2c5c8ab commit 22f75c7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
12 changes: 5 additions & 7 deletions cmake/HPX_SetupOpenSHMEM.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,7 @@ macro(hpx_setup_openshmem)
)
else()

find_file(OPENSHMEM_PKGCONFIG_FILE_FOUND
${OPENSHMEM_PC}.pc
find_file(OPENSHMEM_PKGCONFIG_FILE_FOUND ${OPENSHMEM_PC}.pc
${OPENSHMEM_DIR}/install/lib/pkgconfig
)

Expand Down Expand Up @@ -194,10 +193,7 @@ macro(hpx_setup_openshmem)
set(CMAKE_PREFIX_PATH "${OPENSHMEM_DIR}/install/lib/pkgconfig")
set(ENV{PKG_CONFIG_PATH} "${OPENSHMEM_DIR}/install/lib/pkgconfig")

pkg_search_module(
OPENSHMEM REQUIRED IMPORTED_TARGET GLOBAL
${OPENSHMEM_PC}
)
pkg_search_module(OPENSHMEM REQUIRED IMPORTED_TARGET GLOBAL ${OPENSHMEM_PC})

if(NOT OPENSHMEM_FOUND)
message(
Expand All @@ -206,7 +202,9 @@ macro(hpx_setup_openshmem)
)
endif()
elseif((NOT OPENSHMEM_FOUND) AND (NOT HPX_WITH_FETCH_OPENSHMEM))
message(FATAL_ERROR "OpenSHMEM not found and HPX_WITH_FETCH_OPENSHMEM not set!")
message(
FATAL_ERROR "OpenSHMEM not found and HPX_WITH_FETCH_OPENSHMEM not set!"
)
endif()

if(OPENSHMEM_CFLAGS)
Expand Down
4 changes: 1 addition & 3 deletions libs/core/version/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ if(HPX_WITH_NETWORKING AND HPX_WITH_PARCELPORT_LCI)
hpx_setup_lci()
set(additional_dependencies ${additional_dependencies} LCI::LCI)
endif()
if(HPX_WITH_NETWORKING
AND HPX_WITH_PARCELPORT_OPENSHMEM
)
if(HPX_WITH_NETWORKING AND HPX_WITH_PARCELPORT_OPENSHMEM)
include(HPX_SetupOpenSHMEM)
hpx_setup_openshmem()
set(additional_dependencies ${additional_dependencies} PkgConfig::OPENSHMEM)
Expand Down

0 comments on commit 22f75c7

Please sign in to comment.