Skip to content

Commit 1fd245b

Browse files
committed
Revert whitespace changes
1 parent b401329 commit 1fd245b

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

CMakeLists.txt

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ endif()
5757
# message("CMAKE_CXX_COMPILER_ID is ${CMAKE_CXX_COMPILER_ID}")
5858
if (CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
5959
message(STATUS "Compiler is IntelLLVM")
60-
if (CMAKE_HOST_WIN32 AND CMAKE_VERSION VERSION_LESS "3.23.0")
60+
if (CMAKE_HOST_WIN32 AND CMAKE_VERSION VERSION_LESS "3.23.0")
6161
message(FATAL_ERROR "Need at least CMake 3.23 for IntelLLVM support of IntelDPCPP package on Windows")
6262
elseif(CMAKE_VERSION VERSION_LESS "3.23.0")
6363
message(FATAL_ERROR "CMake 3.20.5 is the minimum recommended for IntelLLVM on Linux")
@@ -121,9 +121,9 @@ endif()
121121

122122
option(HIGHS_COVERAGE "Activate the code coverage compilation" OFF)
123123

124-
# Address | Thread | Leak
124+
# Address | Thread | Leak
125125
# Linux atm
126-
# Only Debug is theted atm
126+
# Only Debug is theted atm
127127
# See below for RelWithDeb info, todo test wip
128128
set(DEBUG_MEMORY "Off" CACHE STRING "Sanitizers")
129129

@@ -137,7 +137,7 @@ message(STATUS "Build pdlp with GPU: ${CUPDLP_GPU}")
137137
option(CUPDLP_FIND_CUDA "Build pdlp with GPU" OFF)
138138
message(STATUS "Use FindCUDAConf: ${CUPDLP_FIND_CUDA}")
139139

140-
if(CUPDLP_GPU AND CMAKE_VERSION VERSION_LESS "3.25.0")
140+
if(CUPDLP_GPU AND CMAKE_VERSION VERSION_LESS "3.25.0")
141141
message("CUPDLP FindCUDAConf requires CMake version minumum 3.24. Please use a higher version of CMake.")
142142
endif()
143143

@@ -173,11 +173,11 @@ if (CUPDLP_GPU)
173173
# With FindCUDAConf.cmake
174174
# Need to have the CUDA_HOME environment variable set.
175175
include(FindCUDAConf)
176-
else()
176+
else()
177177
# Without FindCUDAConf.cmake
178178
enable_language(CUDA)
179179
find_package(CUDAToolkit REQUIRED)
180-
180+
181181
set(CUDA_LIBRARY-NOTFOUND, OFF)
182182
set(CUDA_LIBRARY CUDA::cudart CUDA::cublas CUDA::cusparse)
183183
endif()
@@ -187,7 +187,7 @@ else()
187187
set(CUDA_LIBRARY-NOTFOUND true)
188188
endif()
189189

190-
# HiPO deps
190+
# HiPO deps
191191
if(HIPO)
192192
include(FindHipoDeps)
193193
endif()
@@ -225,7 +225,7 @@ if (BUILD_CXX)
225225
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
226226
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
227227
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
228-
# for multi-config build system (e.g. xcode)
228+
# for multi-config build system (e.g. xcode)
229229
foreach(OutputConfig IN LISTS CMAKE_CONFIGURATION_TYPES)
230230
string(TOUPPER ${OutputConfig} OUTPUTCONFIG)
231231
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${OutputConfig}/${CMAKE_INSTALL_LIBDIR})
@@ -264,14 +264,14 @@ if (BUILD_CXX)
264264
option(STDCALL "Build highs with the __stdcall convention" OFF)
265265
endif()
266266

267-
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR
268-
CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR
269-
CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
267+
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR
268+
CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR
269+
CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
270270
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
271-
# elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
271+
# elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
272272
# not recognised by cl
273-
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++11")
274-
endif()
273+
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++11")
274+
endif()
275275

276276
# Basic type
277277
include(CMakePushCheckState)
@@ -295,7 +295,7 @@ if (BUILD_CXX)
295295
check_type_size("int *" SIZEOF_INT_P LANGUAGE CXX)
296296
message(STATUS "Found int * size: ${SIZEOF_INT_P}")
297297
cmake_pop_check_state()
298-
298+
299299
# Use current CMAKE_C_FLAGS and CMAKE_CXX_FLAGS when checking for IPO support,
300300
# instead of defaults: https://cmake.org/cmake/help/latest/policy/CMP0138.html
301301
if(MSVC AND BUILD_SHARED_LIBS)
@@ -313,7 +313,7 @@ if (BUILD_CXX)
313313
set(ipo_supported NO)
314314
message(STATUS "IPO / LTO not currently supported building HiGHS on MinGW")
315315
else()
316-
if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
316+
if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
317317
cmake_policy(SET CMP0138 NEW)
318318
endif()
319319

@@ -448,7 +448,7 @@ endif()
448448

449449
# For debug of cuda locally
450450

451-
# does not work with older CMake
451+
# does not work with older CMake
452452
# add_compile_options("$<$<AND:$<CONFIG:Debug,RelWithDebInfo>,$<COMPILE_LANGUAGE:CUDA>>:-G>")
453453

454454
# add_compile_options("$<$<COMPILE_LANGUAGE:CUDA>:-G>")
@@ -473,7 +473,7 @@ if(MSVC)
473473
add_compile_options("$<$<COMPILE_LANGUAGE:C,CXX>:-D_CRT_SECURE_NO_WARNINGS>")
474474
add_compile_options("$<$<COMPILE_LANGUAGE:C,CXX>:/MP>")
475475

476-
# Try to split large pdb files into objects.
476+
# Try to split large pdb files into objects.
477477
# https://github.com/tensorflow/tensorflow/issues/31610
478478
# add_compile_options("/Z7")
479479
# add_link_options("/DEBUG:FASTLINK")
@@ -634,11 +634,11 @@ if(FAST_BUILD AND HIGHS_COVERAGE)
634634
message(STATUS "Building in coverage mode")
635635

636636
# Enable coverage flags
637-
add_compile_options(-O0)
638-
add_compile_options(--coverage)
639-
add_compile_options(-fprofile-update=atomic)
637+
add_compile_options(-O0)
638+
add_compile_options(--coverage)
639+
add_compile_options(-fprofile-update=atomic)
640640

641-
add_link_options(-O0)
641+
add_link_options(-O0)
642642
add_link_options(--coverage) # Ensure coverage data is linked correctly
643643

644644
find_program(GCOV_PATH gcov)

0 commit comments

Comments
 (0)