Skip to content

Commit fd1f68d

Browse files
committed
fix CMake formatting
1 parent 09f4d6d commit fd1f68d

1 file changed

Lines changed: 16 additions & 20 deletions

File tree

CMakeLists.txt

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -325,11 +325,11 @@ if(UMF_LINK_HWLOC_STATICALLY)
325325
set(hwloc_targ_SOURCE_DIR ${hwloc_targ_PREFIX}/src/hwloc_targ)
326326
set(hwloc_targ_BINARY_DIR ${hwloc_targ_PREFIX})
327327

328-
# CC/CXX/CFLAGS/CXXFLAGS are not forwarded by CMake into the
329-
# autotools ./configure invocation below, so hwloc would otherwise
330-
# be built with the ambient host compiler instead of the one CMake
331-
# was configured to use (e.g. a sysroot- or toolchain-file-pinned
332-
# compiler), causing an ABI mismatch against the rest of the build.
328+
# CC/CXX/CFLAGS/CXXFLAGS are not forwarded by CMake into the autotools
329+
# ./configure invocation below, so hwloc would otherwise be built with
330+
# the ambient host compiler instead of the one CMake was configured to
331+
# use (e.g. a sysroot- or toolchain-file-pinned compiler), causing an
332+
# ABI mismatch against the rest of the build.
333333
ExternalProject_Add(
334334
hwloc_targ
335335
PREFIX ${hwloc_targ_PREFIX}
@@ -338,19 +338,15 @@ if(UMF_LINK_HWLOC_STATICALLY)
338338
UPDATE_DISCONNECTED TRUE
339339
PATCH_COMMAND git apply
340340
${PROJECT_SOURCE_DIR}/cmake/fix_coverity_issues.patch
341-
CONFIGURE_COMMAND
342-
${CMAKE_COMMAND} -E env
343-
CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER}
344-
<SOURCE_DIR>/autogen.sh
345-
COMMAND
346-
${CMAKE_COMMAND} -E env
347-
CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER}
348-
<SOURCE_DIR>/configure --prefix=<INSTALL_DIR>
349-
--enable-static=yes --enable-shared=no
350-
--disable-libxml2 --disable-pci --disable-levelzero
351-
--disable-opencl --disable-cuda --disable-nvml
352-
--disable-libudev --disable-rsmi
353-
CFLAGS=-fPIC CXXFLAGS=-fPIC
341+
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env CC=${CMAKE_C_COMPILER}
342+
CXX=${CMAKE_CXX_COMPILER} <SOURCE_DIR>/autogen.sh
343+
COMMAND
344+
${CMAKE_COMMAND} -E env CC=${CMAKE_C_COMPILER}
345+
CXX=${CMAKE_CXX_COMPILER} <SOURCE_DIR>/configure
346+
--prefix=<INSTALL_DIR> --enable-static=yes --enable-shared=no
347+
--disable-libxml2 --disable-pci --disable-levelzero
348+
--disable-opencl --disable-cuda --disable-nvml --disable-libudev
349+
--disable-rsmi CFLAGS=-fPIC CXXFLAGS=-fPIC
354350
BUILD_COMMAND make
355351
BUILD_IN_SOURCE TRUE
356352
INSTALL_COMMAND make install
@@ -378,8 +374,8 @@ endif()
378374

379375
if(WINDOWS AND hwloc_targ_SOURCE_DIR)
380376
# Apply security patch for HWLOC. On non-Windows this is applied via
381-
# ExternalProject_Add's PATCH_COMMAND instead, since that source tree
382-
# is only populated at build time, not at configure time.
377+
# ExternalProject_Add's PATCH_COMMAND instead, since that source tree is
378+
# only populated at build time, not at configure time.
383379
execute_process(
384380
COMMAND git apply ${PROJECT_SOURCE_DIR}/cmake/fix_coverity_issues.patch
385381
WORKING_DIRECTORY ${hwloc_targ_SOURCE_DIR}

0 commit comments

Comments
 (0)