tjh.dev / nixpkgs
nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork atom
nixpkgs / pkgs / by-name / cm / cmake / remove-impure-search-paths.patch
at python-updates 1968 lines 62 kB view raw
1diff --git a/Modules/CMakeDetermineJavaCompiler.cmake b/Modules/CMakeDetermineJavaCompiler.cmake 2index b20a255621..bc67fdf4aa 100644 3--- a/Modules/CMakeDetermineJavaCompiler.cmake 4+++ b/Modules/CMakeDetermineJavaCompiler.cmake 5@@ -42,19 +42,6 @@ 6 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/bin" 7 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/bin" 8 $ENV{JAVA_HOME}/bin 9- /usr/bin 10- /usr/lib/java/bin 11- /usr/share/java/bin 12- /usr/local/bin 13- /usr/local/java/bin 14- /usr/local/java/share/bin 15- /usr/java/j2sdk1.4.2_04 16- /usr/lib/j2sdk1.4-sun/bin 17- /usr/java/j2sdk1.4.2_09/bin 18- /usr/lib/j2sdk1.5-sun/bin 19- /opt/sun-jdk-1.5.0.04/bin 20- /usr/local/jdk-1.7.0/bin 21- /usr/local/jdk-1.6.0/bin 22 ) 23 # if no compiler has been specified yet, then look for one 24 if(CMAKE_Java_COMPILER_INIT) 25diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake 26index dd8d30e3d9..d500364ba5 100644 27--- a/Modules/CMakeDetermineSystem.cmake 28+++ b/Modules/CMakeDetermineSystem.cmake 29@@ -9,7 +9,7 @@ 30 31 # find out on which system cmake runs 32 if(CMAKE_HOST_UNIX) 33- find_program(CMAKE_UNAME NAMES uname PATHS /bin /usr/bin /usr/local/bin) 34+ find_program(CMAKE_UNAME NAMES uname) 35 if(CMAKE_UNAME) 36 if(CMAKE_HOST_SYSTEM_NAME STREQUAL "AIX") 37 execute_process(COMMAND ${CMAKE_UNAME} -v 38diff --git a/Modules/CMakeFindFrameworks.cmake b/Modules/CMakeFindFrameworks.cmake 39index 87ad38b46b..95f226be40 100644 40--- a/Modules/CMakeFindFrameworks.cmake 41+++ b/Modules/CMakeFindFrameworks.cmake 42@@ -39,22 +39,10 @@ 43 macro(CMAKE_FIND_FRAMEWORKS fwk) 44 set(${fwk}_FRAMEWORKS) 45 if(APPLE) 46- # 'Frameworks' directory from Brew (Apple Silicon and Intel) 47- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") 48- set(_brew_framework_path /opt/homebrew/Frameworks) 49- else() 50- set(_brew_framework_path /usr/local/Frameworks) 51- endif() 52- 53 file(TO_CMAKE_PATH "$ENV{CMAKE_FRAMEWORK_PATH}" _cmff_CMAKE_FRAMEWORK_PATH) 54 set(_cmff_search_paths 55 ${CMAKE_FRAMEWORK_PATH} 56 ${_cmff_CMAKE_FRAMEWORK_PATH} 57- ~/Library/Frameworks 58- ${_brew_framework_path} 59- /Library/Frameworks 60- /System/Library/Frameworks 61- /Network/Library/Frameworks 62 ${CMAKE_SYSTEM_FRAMEWORK_PATH}) 63 64 # For backwards compatibility reasons, 65diff --git a/Modules/CMakeFindJavaCommon.cmake b/Modules/CMakeFindJavaCommon.cmake 66index 95ca9b57b6..616295e031 100644 67--- a/Modules/CMakeFindJavaCommon.cmake 68+++ b/Modules/CMakeFindJavaCommon.cmake 69@@ -15,20 +15,6 @@ 70 if(_ENV_JAVA_HOME AND IS_DIRECTORY "${_ENV_JAVA_HOME}") 71 set(_JAVA_HOME "${_ENV_JAVA_HOME}") 72 set(_JAVA_HOME_EXPLICIT 1) 73- else() 74- set(_CMD_JAVA_HOME "") 75- if(APPLE AND EXISTS /usr/libexec/java_home) 76- execute_process(COMMAND /usr/libexec/java_home 77- OUTPUT_VARIABLE _CMD_JAVA_HOME 78- OUTPUT_STRIP_TRAILING_WHITESPACE 79- ERROR_QUIET 80- ) 81- endif() 82- if(_CMD_JAVA_HOME AND IS_DIRECTORY "${_CMD_JAVA_HOME}") 83- set(_JAVA_HOME "${_CMD_JAVA_HOME}") 84- set(_JAVA_HOME_EXPLICIT 0) 85- endif() 86- unset(_CMD_JAVA_HOME) 87 endif() 88 unset(_ENV_JAVA_HOME) 89 endif() 90diff --git a/Modules/CMakeFindPackageMode.cmake b/Modules/CMakeFindPackageMode.cmake 91index 6e2762cf41..f88cf2f7c1 100644 92--- a/Modules/CMakeFindPackageMode.cmake 93+++ b/Modules/CMakeFindPackageMode.cmake 94@@ -64,7 +64,7 @@ 95 # from the outside 96 if(NOT CMAKE_SIZEOF_VOID_P) 97 set(CMAKE_SIZEOF_VOID_P 4) 98- if(EXISTS ${CMAKE_SYSROOT}/usr/lib64) 99+ if(FALSE) 100 set(CMAKE_SIZEOF_VOID_P 8) 101 else() 102 # use the file utility to check whether itself is 64 bit: 103@@ -79,22 +79,6 @@ 104 endif() 105 endif() 106 107- # guess Debian multiarch if it has not been set: 108- if(EXISTS /etc/debian_version) 109- if(NOT CMAKE_${LANGUAGE}_LIBRARY_ARCHITECTURE ) 110- file(GLOB filesInLib RELATIVE /lib /lib/*-linux-gnu* ) 111- foreach(file ${filesInLib}) 112- if("${file}" MATCHES "${CMAKE_LIBRARY_ARCHITECTURE_REGEX}") 113- set(CMAKE_${LANGUAGE}_LIBRARY_ARCHITECTURE ${file}) 114- break() 115- endif() 116- endforeach() 117- endif() 118- if(NOT CMAKE_LIBRARY_ARCHITECTURE) 119- set(CMAKE_LIBRARY_ARCHITECTURE ${CMAKE_${LANGUAGE}_LIBRARY_ARCHITECTURE}) 120- endif() 121- endif() 122- 123 endif() 124 125 set(CMAKE_${LANGUAGE}_COMPILER "dummy") 126diff --git a/Modules/CMakeFindSublimeText2.cmake b/Modules/CMakeFindSublimeText2.cmake 127index fc0ec313b8..46d8418d2c 100644 128--- a/Modules/CMakeFindSublimeText2.cmake 129+++ b/Modules/CMakeFindSublimeText2.cmake 130@@ -7,15 +7,6 @@ 131 132 find_program(CMAKE_SUBLIMETEXT_EXECUTABLE 133 NAMES subl3 subl sublime_text 134- PATHS 135- "/Applications/Sublime Text.app/Contents/SharedSupport/bin" 136- "/Applications/Sublime Text 3.app/Contents/SharedSupport/bin" 137- "/Applications/Sublime Text 2.app/Contents/SharedSupport/bin" 138- "$ENV{HOME}/Applications/Sublime Text.app/Contents/SharedSupport/bin" 139- "$ENV{HOME}/Applications/Sublime Text 3.app/Contents/SharedSupport/bin" 140- "$ENV{HOME}/Applications/Sublime Text 2.app/Contents/SharedSupport/bin" 141- "/opt/sublime_text" 142- "/opt/sublime_text_3" 143 DOC "The Sublime Text executable") 144 145 if(CMAKE_SUBLIMETEXT_EXECUTABLE) 146diff --git a/Modules/CPackIFW.cmake b/Modules/CPackIFW.cmake 147index 2a2f478fd7..f22281bdca 100644 148--- a/Modules/CPackIFW.cmake 149+++ b/Modules/CPackIFW.cmake 150@@ -426,7 +426,7 @@ 151 else() 152 list(APPEND _CPACK_IFW_PATHS 153 "$ENV{HOME}/Qt" 154- "/opt/Qt") 155+ ) 156 endif() 157 list(REMOVE_DUPLICATES _CPACK_IFW_PATHS) 158 159diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake 160index b45a279b94..884ccc0e32 100644 161--- a/Modules/FindBLAS.cmake 162+++ b/Modules/FindBLAS.cmake 163@@ -1098,16 +1098,8 @@ 164 ((BLA_VENDOR STREQUAL "ACML_GPU") AND (NOT BLAS_ACML_GPU_LIB_DIRS)) 165 ) 166 # try to find acml in "standard" paths 167- if(WIN32) 168- file(GLOB _ACML_ROOT "C:/AMD/acml*/ACML-EULA.txt") 169- else() 170- file(GLOB _ACML_ROOT "/opt/acml*/ACML-EULA.txt") 171- endif() 172- if(WIN32) 173- file(GLOB _ACML_GPU_ROOT "C:/AMD/acml*/GPGPUexamples") 174- else() 175- file(GLOB _ACML_GPU_ROOT "/opt/acml*/GPGPUexamples") 176- endif() 177+ set(_ACML_ROOT) 178+ set(_ACML_GPU_ROOT) 179 list(GET _ACML_ROOT 0 _ACML_ROOT) 180 list(GET _ACML_GPU_ROOT 0 _ACML_GPU_ROOT) 181 if(_ACML_ROOT) 182diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake 183index bceb615ca0..2350b15655 100644 184--- a/Modules/FindCUDA.cmake 185+++ b/Modules/FindCUDA.cmake 186@@ -854,7 +854,6 @@ 187 # Now search default paths 188 find_program(CUDA_TOOLKIT_ROOT_DIR_NVCC 189 NAMES nvcc nvcc.exe 190- PATHS /opt/cuda/bin 191 PATH_SUFFIXES cuda/bin 192 DOC "Toolkit location." 193 ) 194@@ -1014,7 +1013,6 @@ 195 # Search default search paths, after we search our own set of paths. 196 find_library(${_var} 197 NAMES ${_names} 198- PATHS "/usr/lib/nvidia-current" 199 DOC ${_doc} 200 ) 201 endif() 202@@ -1114,11 +1112,6 @@ 203 if (CUDA_rt_LIBRARY) 204 list(APPEND CUDA_LIBRARIES ${CUDA_rt_LIBRARY}) 205 endif() 206- if(APPLE) 207- # We need to add the default path to the driver (libcuda.dylib) as an rpath, so that 208- # the static cuda runtime can find it at runtime. 209- list(APPEND CUDA_LIBRARIES -Wl,-rpath,/usr/local/cuda/lib) 210- endif() 211 else() 212 list(APPEND CUDA_LIBRARIES ${CUDA_CUDART_LIBRARY}) 213 endif() 214@@ -1223,8 +1216,6 @@ 215 "$ENV{NVSDKCOMPUTE_ROOT}/C" 216 ENV NVSDKCUDA_ROOT 217 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\NVIDIA Corporation\\Installed Products\\NVIDIA SDK 10\\Compute;InstallDir]" 218- PATHS 219- "/Developer/GPU\ Computing/C" 220 ) 221 222 # Keep the CUDA_SDK_ROOT_DIR first in order to be able to override the 223@@ -1236,7 +1227,6 @@ 224 "${CUDA_TOOLKIT_ROOT_DIR}/NV_CUDA_SDK" 225 "$ENV{HOME}/NVIDIA_CUDA_SDK" 226 "$ENV{HOME}/NVIDIA_CUDA_SDK_MACOSX" 227- "/Developer/CUDA" 228 ) 229 230 # Example of how to find an include file from the CUDA_SDK_ROOT_DIR 231diff --git a/Modules/FindCUDAToolkit.cmake b/Modules/FindCUDAToolkit.cmake 232index b00cd26b7e..f5f74ebe1d 100644 233--- a/Modules/FindCUDAToolkit.cmake 234+++ b/Modules/FindCUDAToolkit.cmake 235@@ -776,12 +776,6 @@ 236 elseif(CUDAToolkit_ROOT_DIR AND EXISTS "${CUDAToolkit_ROOT_DIR}/${vf}") 237 set(${result_variable} "${CUDAToolkit_ROOT_DIR}/${vf}" PARENT_SCOPE) 238 break() 239- elseif(CMAKE_SYSROOT_LINK AND EXISTS "${CMAKE_SYSROOT_LINK}/usr/lib/cuda/${vf}") 240- set(${result_variable} "${CMAKE_SYSROOT_LINK}/usr/lib/cuda/${vf}" PARENT_SCOPE) 241- break() 242- elseif(EXISTS "${CMAKE_SYSROOT}/usr/lib/cuda/${vf}") 243- set(${result_variable} "${CMAKE_SYSROOT}/usr/lib/cuda/${vf}" PARENT_SCOPE) 244- break() 245 endif() 246 endforeach() 247 endfunction() 248@@ -864,18 +858,8 @@ 249 # if CUDAToolkit_ROOT is not specified, it is assumed that the symlinked 250 # directory is the desired location. 251 if(NOT CUDAToolkit_ROOT_DIR) 252- if(UNIX) 253- if(NOT APPLE) 254- set(platform_base "/usr/local/cuda-") 255- else() 256- set(platform_base "/Developer/NVIDIA/CUDA-") 257- endif() 258- else() 259- set(platform_base "C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v") 260- endif() 261- 262 # Build out a descending list of possible cuda installations, e.g. 263- file(GLOB possible_paths "${platform_base}*") 264+ set(possible_paths) 265 # Iterate the glob results and create a descending list. 266 set(versions) 267 foreach(p ${possible_paths}) 268@@ -891,14 +875,6 @@ 269 270 # With a descending list of versions, populate possible paths to search. 271 set(search_paths) 272- foreach(v ${versions}) 273- list(APPEND search_paths "${platform_base}${v}") 274- endforeach() 275- 276- # Force the global default /usr/local/cuda to the front on Unix. 277- if(UNIX) 278- list(INSERT search_paths 0 "/usr/local/cuda") 279- endif() 280 281 # Now search for the toolkit again using the platform default search paths. 282 _CUDAToolkit_find_root_dir(SEARCH_PATHS "${search_paths}" FIND_FLAGS PATH_SUFFIXES bin) 283diff --git a/Modules/FindCoin3D.cmake b/Modules/FindCoin3D.cmake 284index 1d89c604e0..5b70e71a87 100644 285--- a/Modules/FindCoin3D.cmake 286+++ b/Modules/FindCoin3D.cmake 287@@ -76,10 +76,8 @@ 288 else () 289 if(APPLE) 290 find_path(COIN3D_INCLUDE_DIRS Inventor/So.h 291- /Library/Frameworks/Inventor.framework/Headers 292 ) 293 find_library(COIN3D_LIBRARIES Coin 294- /Library/Frameworks/Inventor.framework/Libraries 295 ) 296 set(COIN3D_LIBRARIES "-framework Coin3d" CACHE STRING "Coin3D library for OSX") 297 else() 298diff --git a/Modules/FindCurses.cmake b/Modules/FindCurses.cmake 299index 64600c6c64..de6af241a1 100644 300--- a/Modules/FindCurses.cmake 301+++ b/Modules/FindCurses.cmake 302@@ -136,15 +136,7 @@ 303 # message. Cygwin is an ncurses package, so force ncurses on 304 # cygwin if the curses.h is missing 305 if(CURSES_NCURSES_LIBRARY AND CYGWIN) 306- if (CURSES_NEED_WIDE) 307- if(NOT EXISTS /usr/include/ncursesw/curses.h) 308- set(CURSES_USE_NCURSES TRUE) 309- endif() 310- else() 311- if(NOT EXISTS /usr/include/curses.h) 312- set(CURSES_USE_NCURSES TRUE) 313- endif() 314- endif() 315+ set(CURSES_USE_NCURSES TRUE) 316 endif() 317 318 319diff --git a/Modules/FindDCMTK.cmake b/Modules/FindDCMTK.cmake 320index 4e0ff47f52..6db26cb855 100644 321--- a/Modules/FindDCMTK.cmake 322+++ b/Modules/FindDCMTK.cmake 323@@ -88,14 +88,7 @@ 324 325 set(_dcmtk_dir_description "The directory of DCMTK build or install tree.") 326 327-# Ensure that DCMTK_DIR is set to a reasonable default value 328-# so that DCMTK libraries can be found on a standard Unix distribution. 329-# It also overwrite the value of DCMTK_DIR after this one has been 330-# set by a successful discovery of DCMTK by the unpatched FindDCMTK.cmake module 331-# distributed with CMake (as of 0167cea) 332-if(NOT DCMTK_DIR OR DCMTK_DIR STREQUAL "/usr/include/dcmtk") 333- set(DCMTK_DIR "/usr" CACHE PATH ${_dcmtk_dir_description} FORCE) 334-endif() 335+set(DCMTK_DIR CACHE PATH ${_dcmtk_dir_description}) 336 337 set(_SAVED_DCMTK_DIR ${DCMTK_DIR}) 338 339diff --git a/Modules/FindDart.cmake b/Modules/FindDart.cmake 340index 96cce45590..245dffaf21 100644 341--- a/Modules/FindDart.cmake 342+++ b/Modules/FindDart.cmake 343@@ -24,7 +24,6 @@ 344 ENV DART_ROOT 345 PATHS 346 ${PROJECT_SOURCE_DIR} 347- /usr/share 348 C:/ 349 "C:/Program Files" 350 ${PROJECT_SOURCE_DIR}/.. 351diff --git a/Modules/FindDoxygen.cmake b/Modules/FindDoxygen.cmake 352index 2d430994e8..335c733150 100644 353--- a/Modules/FindDoxygen.cmake 354+++ b/Modules/FindDoxygen.cmake 355@@ -755,10 +755,6 @@ 356 NAMES doxygen 357 PATHS 358 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\doxygen_is1;Inno Setup: App Path]/bin" 359- /Applications/Doxygen.app/Contents/Resources 360- /Applications/Doxygen.app/Contents/MacOS 361- /Applications/Utilities/Doxygen.app/Contents/Resources 362- /Applications/Utilities/Doxygen.app/Contents/MacOS 363 DOC "Doxygen documentation generation tool (https://www.doxygen.nl)" 364 VALIDATOR _Doxygen_version_validator 365 ) 366@@ -845,12 +841,6 @@ 367 "$ENV{ProgramFiles}/ATT/Graphviz/bin" 368 "C:/Program Files/ATT/Graphviz/bin" 369 [HKEY_LOCAL_MACHINE\\SOFTWARE\\ATT\\Graphviz;InstallPath]/bin 370- /Applications/Graphviz.app/Contents/MacOS 371- /Applications/Utilities/Graphviz.app/Contents/MacOS 372- /Applications/Doxygen.app/Contents/Resources 373- /Applications/Doxygen.app/Contents/MacOS 374- /Applications/Utilities/Doxygen.app/Contents/Resources 375- /Applications/Utilities/Doxygen.app/Contents/MacOS 376 DOC "Dot tool for use with Doxygen" 377 ) 378 mark_as_advanced(DOXYGEN_DOT_EXECUTABLE) 379diff --git a/Modules/FindFontconfig.cmake b/Modules/FindFontconfig.cmake 380index 218ad2fbfa..94e6052564 100644 381--- a/Modules/FindFontconfig.cmake 382+++ b/Modules/FindFontconfig.cmake 383@@ -64,7 +64,6 @@ 384 fontconfig/fontconfig.h 385 HINTS 386 ${PKG_FONTCONFIG_INCLUDE_DIRS} 387- /usr/X11/include 388 ) 389 390 find_library( Fontconfig_LIBRARY 391diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake 392index e29758dc1c..d6255f98c2 100644 393--- a/Modules/FindGLUT.cmake 394+++ b/Modules/FindGLUT.cmake 395@@ -120,12 +120,10 @@ 396 set(_GLUT_glut_LIB_DIR /boot/develop/lib/x86) 397 else() 398 find_library( GLUT_Xi_LIBRARY Xi 399- /usr/openwin/lib 400 ) 401 mark_as_advanced(GLUT_Xi_LIBRARY) 402 403 find_library( GLUT_Xmu_LIBRARY Xmu 404- /usr/openwin/lib 405 ) 406 mark_as_advanced(GLUT_Xmu_LIBRARY) 407 408@@ -145,11 +143,6 @@ 409 410 find_path( GLUT_INCLUDE_DIR GL/glut.h 411 PATHS 412- /usr/include/GL 413- /usr/openwin/share/include 414- /usr/openwin/include 415- /opt/graphics/OpenGL/include 416- /opt/graphics/OpenGL/contrib/libglut 417 ${_GLUT_INC_DIR} 418 HINTS 419 ${PC_GLUT_INCLUDE_DIRS} 420@@ -158,7 +151,6 @@ 421 422 find_library( GLUT_glut_LIBRARY glut 423 PATHS 424- /usr/openwin/lib 425 ${_GLUT_glut_LIB_DIR} 426 HINTS 427 ${PC_GLUT_LIBRARY_DIRS} 428diff --git a/Modules/FindGTK.cmake b/Modules/FindGTK.cmake 429index 6e39f5a989..df231de76e 100644 430--- a/Modules/FindGTK.cmake 431+++ b/Modules/FindGTK.cmake 432@@ -71,9 +71,6 @@ 433 find_path( GTK_gtk_INCLUDE_PATH NAMES gtk/gtk.h 434 PATH_SUFFIXES gtk-1.2 gtk12 435 PATHS 436- /usr/openwin/share/include 437- /usr/openwin/include 438- /opt/gnome/include 439 ) 440 441 # Some Linux distributions (e.g. Red Hat) have glibconfig.h 442@@ -84,26 +81,17 @@ 443 find_path( GTK_glibconfig_INCLUDE_PATH NAMES glibconfig.h 444 PATH_SUFFIXES glib/include lib/glib/include include/glib12 445 PATHS 446- /usr/openwin/share/include 447- /opt/gnome/include 448- /opt/gnome/lib/glib/include 449 ) 450 451 find_path( GTK_glib_INCLUDE_PATH NAMES glib.h 452 PATH_SUFFIXES gtk-1.2 glib-1.2 glib12 glib/include lib/glib/include 453 PATHS 454- /usr/openwin/share/include 455- /opt/gnome/include 456 ) 457 458 find_path( GTK_gtkgl_INCLUDE_PATH NAMES gtkgl/gtkglarea.h 459- PATHS /usr/openwin/share/include 460- /opt/gnome/include 461 ) 462 463 find_library( GTK_gtkgl_LIBRARY gtkgl 464- /usr/openwin/lib 465- /opt/gnome/lib 466 ) 467 468 # 469@@ -112,38 +100,26 @@ 470 471 find_library( GTK_gtk_LIBRARY 472 NAMES gtk gtk12 473- PATHS /usr/openwin/lib 474- /opt/gnome/lib 475 ) 476 477 find_library( GTK_gdk_LIBRARY 478 NAMES gdk gdk12 479- PATHS /usr/openwin/lib 480- /opt/gnome/lib 481 ) 482 483 find_library( GTK_gmodule_LIBRARY 484 NAMES gmodule gmodule12 485- PATHS /usr/openwin/lib 486- /opt/gnome/lib 487 ) 488 489 find_library( GTK_glib_LIBRARY 490 NAMES glib glib12 491- PATHS /usr/openwin/lib 492- /opt/gnome/lib 493 ) 494 495 find_library( GTK_Xi_LIBRARY 496 NAMES Xi 497- PATHS /usr/openwin/lib 498- /opt/gnome/lib 499 ) 500 501 find_library( GTK_gthread_LIBRARY 502 NAMES gthread gthread12 503- PATHS /usr/openwin/lib 504- /opt/gnome/lib 505 ) 506 507 if(GTK_gtk_INCLUDE_PATH 508diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake 509index 9c5bc63272..87f8f81149 100644 510--- a/Modules/FindGTK2.cmake 511+++ b/Modules/FindGTK2.cmake 512@@ -377,34 +377,12 @@ 513 "include suffixes = ${_suffixes}") 514 endif() 515 516- if(CMAKE_LIBRARY_ARCHITECTURE) 517- set(_gtk2_arch_dir /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}) 518- if(GTK2_DEBUG) 519- message(STATUS "Adding ${_gtk2_arch_dir} to search path for multiarch support") 520- endif() 521- endif() 522 find_path(GTK2_${_var}_INCLUDE_DIR ${_hdr} 523 PATHS 524 ${PC_GLIB2_INCLUDEDIR} 525 ${PC_GLIB2_LIBDIR} 526 ${PC_GTK2_INCLUDEDIR} 527 ${PC_GTK2_LIBDIR} 528- ${_gtk2_arch_dir} 529- /usr/local/libx32 530- /usr/local/lib64 531- /usr/local/lib 532- /usr/libx32 533- /usr/lib64 534- /usr/lib 535- /opt/gnome/include 536- /opt/gnome/lib 537- /opt/openwin/include 538- /usr/openwin/lib 539- /sw/lib 540- /opt/local/lib 541- /opt/homebrew/lib 542- /usr/pkg/lib 543- /usr/pkg/include/glib 544 $ENV{GTKMM_BASEPATH}/include 545 $ENV{GTKMM_BASEPATH}/lib 546 [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/include 547@@ -509,8 +487,6 @@ 548 find_library(GTK2_${_var}_LIBRARY_RELEASE 549 NAMES ${_lib_list} 550 PATHS 551- /opt/gnome/lib 552- /usr/openwin/lib 553 $ENV{GTKMM_BASEPATH}/lib 554 [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/lib 555 [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/lib 556diff --git a/Modules/FindIce.cmake b/Modules/FindIce.cmake 557index 82156747d3..cc3f2a64af 100644 558--- a/Modules/FindIce.cmake 559+++ b/Modules/FindIce.cmake 560@@ -629,11 +629,6 @@ 561 list(APPEND ice_roots "${ice_location}") 562 endif() 563 endforeach() 564- else() 565- foreach(ice_version ${ice_versions}) 566- # Prefer 64-bit variants if present (and using a 64-bit compiler) 567- list(APPEND ice_roots "/opt/Ice-${ice_version}") 568- endforeach() 569 endif() 570 571 # Find all Ice programs 572@@ -689,7 +684,7 @@ 573 # In common use on Linux, MacOS X (homebrew) and FreeBSD; prefer 574 # version-specific dir 575 list(APPEND ice_slice_paths 576- /usr/local/share /usr/share) 577+ ) 578 list(APPEND ice_slice_suffixes 579 "Ice-${Ice_VERSION_SLICE2CPP_FULL}/slice" 580 "Ice-${Ice_VERSION_SLICE2CPP_SHORT}/slice" 581diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake 582index 10dcc51776..e272bd9583 100644 583--- a/Modules/FindJNI.cmake 584+++ b/Modules/FindJNI.cmake 585@@ -363,51 +363,6 @@ 586 endif() 587 588 set(_JNI_JAVA_DIRECTORIES_BASE 589- /usr/lib/jvm/java 590- /usr/lib/java 591- /usr/lib/jvm 592- /usr/local/lib/java 593- /usr/local/share/java 594- /usr/lib/j2sdk1.4-sun 595- /usr/lib/j2sdk1.5-sun 596- /opt/sun-jdk-1.5.0.04 597- /usr/lib/jvm/java-6-sun 598- /usr/lib/jvm/java-1.5.0-sun 599- /usr/lib/jvm/java-6-sun-1.6.0.00 # can this one be removed according to #8821 ? Alex 600- /usr/lib/jvm/java-6-openjdk 601- /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0 # fedora 602- # Debian specific paths for default JVM 603- /usr/lib/jvm/default-java 604- # Arch Linux specific paths for default JVM 605- /usr/lib/jvm/default 606- # Ubuntu specific paths for default JVM 607- /usr/lib/jvm/java-21-openjdk-{libarch} # Ubuntu 23.04 608- /usr/lib/jvm/java-20-openjdk-{libarch} # Ubuntu 22.10 609- /usr/lib/jvm/java-19-openjdk-{libarch} # Ubuntu 22.04 LTS 610- /usr/lib/jvm/java-18-openjdk-{libarch} # Ubuntu 22.04 LTS 611- /usr/lib/jvm/java-17-openjdk-{libarch} # Ubuntu 18.04 LTS 612- /usr/lib/jvm/java-16-openjdk-{libarch} # Ubuntu 20.04 LTS 613- /usr/lib/jvm/java-13-openjdk-{libarch} # Ubuntu 20.04 LTS 614- /usr/lib/jvm/java-11-openjdk-{libarch} # Ubuntu 18.04 LTS 615- /usr/lib/jvm/java-8-openjdk-{libarch} # Ubuntu 15.10 616- /usr/lib/jvm/java-7-openjdk-{libarch} # Ubuntu 15.10 617- /usr/lib/jvm/java-6-openjdk-{libarch} # Ubuntu 15.10 618- # OpenBSD specific paths for default JVM 619- /usr/local/jdk-1.7.0 620- /usr/local/jre-1.7.0 621- /usr/local/jdk-1.6.0 622- /usr/local/jre-1.6.0 623- # FreeBSD specific paths for default JVM 624- /usr/local/openjdk15 625- /usr/local/openjdk14 626- /usr/local/openjdk13 627- /usr/local/openjdk12 628- /usr/local/openjdk11 629- /usr/local/openjdk8 630- /usr/local/openjdk7 631- # SuSE specific paths for default JVM 632- /usr/lib64/jvm/java 633- /usr/lib64/jvm/jre 634 ) 635 636 set(_JNI_JAVA_AWT_LIBRARY_TRIES) 637diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake 638index 1587ce648b..e92213cba7 100644 639--- a/Modules/FindJava.cmake 640+++ b/Modules/FindJava.cmake 641@@ -199,17 +199,6 @@ 642 # Hard-coded guesses should still go in PATHS. This ensures that the user 643 # environment can always override hard guesses. 644 set(_JAVA_PATHS 645- /usr/lib/java/bin 646- /usr/share/java/bin 647- /usr/local/java/bin 648- /usr/local/java/share/bin 649- /usr/java/j2sdk1.4.2_04 650- /usr/lib/j2sdk1.4-sun/bin 651- /usr/java/j2sdk1.4.2_09/bin 652- /usr/lib/j2sdk1.5-sun/bin 653- /opt/sun-jdk-1.5.0.04/bin 654- /usr/local/jdk-1.7.0/bin 655- /usr/local/jdk-1.6.0/bin 656 ) 657 find_program(Java_JAVA_EXECUTABLE 658 NAMES java 659diff --git a/Modules/FindKDE3.cmake b/Modules/FindKDE3.cmake 660index ccfad5e7fb..265e99eb1a 100644 661--- a/Modules/FindKDE3.cmake 662+++ b/Modules/FindKDE3.cmake 663@@ -234,9 +234,6 @@ 664 find_program(KDECONFIG_EXECUTABLE NAMES kde-config 665 HINTS 666 $ENV{KDEDIR}/bin 667- PATHS 668- /opt/kde3/bin 669- /opt/kde/bin 670 ) 671 672 set(KDE3PREFIX) 673@@ -261,9 +258,6 @@ 674 HINTS 675 $ENV{KDEDIR}/include 676 ${KDE3PREFIX}/include 677- PATHS 678- /opt/kde3/include 679- /opt/kde/include 680 PATH_SUFFIXES include/kde 681 ) 682 683@@ -272,9 +266,6 @@ 684 HINTS 685 $ENV{KDEDIR}/lib 686 ${KDE3PREFIX}/lib 687- PATHS 688- /opt/kde3/lib 689- /opt/kde/lib 690 ) 691 692 set(QT_AND_KDECORE_LIBS ${QT_LIBRARIES} ${KDE3_KDECORE_LIBRARY}) 693@@ -296,27 +287,18 @@ 694 HINTS 695 $ENV{KDEDIR}/bin 696 ${KDE3PREFIX}/bin 697- PATHS 698- /opt/kde3/bin 699- /opt/kde/bin 700 ) 701 702 find_program(KDE3_DCOPIDL2CPP_EXECUTABLE NAMES dcopidl2cpp 703 HINTS 704 $ENV{KDEDIR}/bin 705 ${KDE3PREFIX}/bin 706- PATHS 707- /opt/kde3/bin 708- /opt/kde/bin 709 ) 710 711 find_program(KDE3_KCFGC_EXECUTABLE NAMES kconfig_compiler 712 HINTS 713 $ENV{KDEDIR}/bin 714 ${KDE3PREFIX}/bin 715- PATHS 716- /opt/kde3/bin 717- /opt/kde/bin 718 ) 719 720 721diff --git a/Modules/FindKDE4.cmake b/Modules/FindKDE4.cmake 722index 220906b2de..7eb7b692d8 100644 723--- a/Modules/FindKDE4.cmake 724+++ b/Modules/FindKDE4.cmake 725@@ -52,7 +52,6 @@ 726 HINTS 727 ${CMAKE_INSTALL_PREFIX} 728 ${_KDEDIRS} 729- /opt/kde4 730 ONLY_CMAKE_FIND_ROOT_PATH 731 ) 732 733diff --git a/Modules/FindLATEX.cmake b/Modules/FindLATEX.cmake 734index e272770af3..9f702c3f6d 100644 735--- a/Modules/FindLATEX.cmake 736+++ b/Modules/FindLATEX.cmake 737@@ -203,14 +203,12 @@ 738 find_program(LATEX_COMPILER 739 NAMES latex 740 PATHS ${MIKTEX_BINARY_PATH} 741- /usr/bin 742 ) 743 744 # find pdflatex 745 find_program(PDFLATEX_COMPILER 746 NAMES pdflatex 747 PATHS ${MIKTEX_BINARY_PATH} 748- /usr/bin 749 ) 750 if (PDFLATEX_COMPILER) 751 set(LATEX_PDFLATEX_FOUND TRUE) 752@@ -222,7 +220,6 @@ 753 find_program(XELATEX_COMPILER 754 NAMES xelatex 755 PATHS ${MIKTEX_BINARY_PATH} 756- /usr/bin 757 ) 758 if (XELATEX_COMPILER) 759 set(LATEX_XELATEX_FOUND TRUE) 760@@ -234,7 +231,6 @@ 761 find_program(LUALATEX_COMPILER 762 NAMES lualatex 763 PATHS ${MIKTEX_BINARY_PATH} 764- /usr/bin 765 ) 766 if (LUALATEX_COMPILER) 767 set(LATEX_LUALATEX_FOUND TRUE) 768@@ -246,7 +242,6 @@ 769 find_program(BIBTEX_COMPILER 770 NAMES bibtex 771 PATHS ${MIKTEX_BINARY_PATH} 772- /usr/bin 773 ) 774 if (BIBTEX_COMPILER) 775 set(LATEX_BIBTEX_FOUND TRUE) 776@@ -258,7 +253,6 @@ 777 find_program(BIBER_COMPILER 778 NAMES biber 779 PATHS ${MIKTEX_BINARY_PATH} 780- /usr/bin 781 ) 782 if (BIBER_COMPILER) 783 set(LATEX_BIBER_FOUND TRUE) 784@@ -270,7 +264,6 @@ 785 find_program(MAKEINDEX_COMPILER 786 NAMES makeindex 787 PATHS ${MIKTEX_BINARY_PATH} 788- /usr/bin 789 ) 790 if (MAKEINDEX_COMPILER) 791 set(LATEX_MAKEINDEX_FOUND TRUE) 792@@ -282,7 +275,6 @@ 793 find_program(XINDY_COMPILER 794 NAMES xindy 795 PATHS ${MIKTEX_BINARY_PATH} 796- /usr/bin 797 ) 798 if (XINDY_COMPILER) 799 set(LATEX_XINDY_FOUND TRUE) 800@@ -294,7 +286,6 @@ 801 find_program(DVIPS_CONVERTER 802 NAMES dvips 803 PATHS ${MIKTEX_BINARY_PATH} 804- /usr/bin 805 ) 806 if (DVIPS_CONVERTER) 807 set(LATEX_DVIPS_FOUND TRUE) 808@@ -306,7 +297,6 @@ 809 find_program(DVIPDF_CONVERTER 810 NAMES dvipdfm dvipdft dvipdf 811 PATHS ${MIKTEX_BINARY_PATH} 812- /usr/bin 813 ) 814 if (DVIPDF_CONVERTER) 815 set(LATEX_DVIPDF_FOUND TRUE) 816@@ -336,7 +326,6 @@ 817 find_program(PDFTOPS_CONVERTER 818 NAMES pdftops 819 PATHS ${MIKTEX_BINARY_PATH} 820- /usr/bin 821 ) 822 if (PDFTOPS_CONVERTER) 823 set(LATEX_PDFTOPS_FOUND TRUE) 824@@ -348,7 +337,6 @@ 825 find_program(LATEX2HTML_CONVERTER 826 NAMES latex2html 827 PATHS ${MIKTEX_BINARY_PATH} 828- /usr/bin 829 ) 830 if (LATEX2HTML_CONVERTER) 831 set(LATEX_LATEX2HTML_FOUND TRUE) 832@@ -360,7 +348,6 @@ 833 find_program(HTLATEX_COMPILER 834 NAMES htlatex 835 PATHS ${MIKTEX_BINARY_PATH} 836- /usr/bin 837 ) 838 if (HTLATEX_COMPILER) 839 set(LATEX_HTLATEX_FOUND TRUE) 840diff --git a/Modules/FindLua50.cmake b/Modules/FindLua50.cmake 841index ac36c86640..fe5d2147e8 100644 842--- a/Modules/FindLua50.cmake 843+++ b/Modules/FindLua50.cmake 844@@ -84,10 +84,6 @@ 845 HINTS 846 ENV LUA_DIR 847 PATH_SUFFIXES lua50 lua5.0 lua5 lua 848- PATHS 849- ~/Library/Frameworks 850- /Library/Frameworks 851- /opt 852 ) 853 854 find_library(LUA_LIBRARY_lua 855@@ -95,10 +91,6 @@ 856 HINTS 857 ENV LUA_DIR 858 PATH_SUFFIXES lib 859- PATHS 860- ~/Library/Frameworks 861- /Library/Frameworks 862- /opt 863 ) 864 865 # In an OS X framework, lualib is usually included as part of the framework 866@@ -113,7 +105,6 @@ 867 ENV LUA_DIR 868 PATH_SUFFIXES lib 869 PATHS 870- /opt 871 ) 872 if(LUA_LIBRARY_lualib AND LUA_LIBRARY_lua) 873 # include the math library for Unix 874diff --git a/Modules/FindLua51.cmake b/Modules/FindLua51.cmake 875index cba30e4b58..21a95cb89f 100644 876--- a/Modules/FindLua51.cmake 877+++ b/Modules/FindLua51.cmake 878@@ -87,10 +87,6 @@ 879 HINTS 880 ENV LUA_DIR 881 PATH_SUFFIXES lua51 lua5.1 lua-5.1 lua 882- PATHS 883- ~/Library/Frameworks 884- /Library/Frameworks 885- /opt 886 ) 887 888 find_library(LUA_LIBRARY 889@@ -98,10 +94,6 @@ 890 HINTS 891 ENV LUA_DIR 892 PATH_SUFFIXES lib 893- PATHS 894- ~/Library/Frameworks 895- /Library/Frameworks 896- /opt 897 ) 898 899 if(LUA_LIBRARY) 900diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake 901index 78b1c5c915..741f86aaef 100644 902--- a/Modules/FindMPI.cmake 903+++ b/Modules/FindMPI.cmake 904@@ -1349,15 +1349,6 @@ 905 endmacro() 906 907 set(MPI_HINT_DIRS ${MPI_HOME} $ENV{MPI_HOME} $ENV{I_MPI_ROOT}) 908-if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") 909- # SUSE Linux Enterprise Server stores its MPI implementations under /usr/lib64/mpi/gcc/<name> 910- # We enumerate the subfolders and append each as a prefix 911- MPI_search_mpi_prefix_folder("/usr/lib64/mpi/gcc") 912-elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD") 913- # FreeBSD ships mpich under the normal system paths - but available openmpi implementations 914- # will be found in /usr/local/mpi/<name> 915- MPI_search_mpi_prefix_folder("/usr/local/mpi") 916-endif() 917 918 # Most MPI distributions have some form of mpiexec or mpirun which gives us something we can look for. 919 # The MPI standard does not mandate the existence of either, but instead only makes requirements if a distribution 920diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake 921index 8a7bd80957..74009fbebc 100644 922--- a/Modules/FindMatlab.cmake 923+++ b/Modules/FindMatlab.cmake 924@@ -1529,7 +1529,7 @@ 925 endif() 926 927 foreach(_matlab_current_release IN LISTS _matlab_releases) 928- foreach(_macos_app_base IN ITEMS "$ENV{HOME}/Applications" "/Applications") 929+ foreach(_macos_app_base IN ITEMS) 930 matlab_get_version_from_release_name("${_matlab_current_release}" _matlab_current_version) 931 string(REPLACE "." "" _matlab_current_version_without_dot "${_matlab_current_version}") 932 set(_matlab_base_path "${_macos_app_base}/MATLAB_${_matlab_current_release}.app") 933diff --git a/Modules/FindMotif.cmake b/Modules/FindMotif.cmake 934index d72b19309e..5753e5c3dc 100644 935--- a/Modules/FindMotif.cmake 936+++ b/Modules/FindMotif.cmake 937@@ -39,12 +39,10 @@ 938 if(UNIX) 939 find_path(MOTIF_INCLUDE_DIR 940 Xm/Xm.h 941- /usr/openwin/include 942 ) 943 944 find_library(MOTIF_LIBRARIES 945 Xm 946- /usr/openwin/lib 947 ) 948 949 endif() 950diff --git a/Modules/FindOpenAL.cmake b/Modules/FindOpenAL.cmake 951index dad9ada128..32d02db7c3 100644 952--- a/Modules/FindOpenAL.cmake 953+++ b/Modules/FindOpenAL.cmake 954@@ -95,9 +95,6 @@ 955 HINTS 956 ENV OPENALDIR 957 PATHS 958- ~/Library/Frameworks 959- /Library/Frameworks 960- /opt 961 [HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir] 962 PATH_SUFFIXES include/AL include/OpenAL include AL OpenAL 963 ) 964@@ -113,9 +110,6 @@ 965 HINTS 966 ENV OPENALDIR 967 PATHS 968- ~/Library/Frameworks 969- /Library/Frameworks 970- /opt 971 [HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir] 972 PATH_SUFFIXES libx32 lib64 lib libs64 libs ${_OpenAL_ARCH_DIR} 973 ) 974diff --git a/Modules/FindOpenCL.cmake b/Modules/FindOpenCL.cmake 975index 3be945ba1b..4086ebe2f2 100644 976--- a/Modules/FindOpenCL.cmake 977+++ b/Modules/FindOpenCL.cmake 978@@ -113,8 +113,6 @@ 979 ENV CUDA_PATH 980 ENV ATISTREAMSDKROOT 981 ENV OCL_ROOT 982- /usr/local/cuda 983- /opt/cuda 984 PATH_SUFFIXES 985 include 986 OpenCL/common/inc 987@@ -170,8 +168,6 @@ 988 PATHS 989 ENV AMDAPPSDKROOT 990 ENV CUDA_PATH 991- /usr/local/cuda 992- /opt/cuda 993 PATH_SUFFIXES 994 lib/x86 995 lib) 996@@ -181,8 +177,6 @@ 997 PATHS 998 ENV AMDAPPSDKROOT 999 ENV CUDA_PATH 1000- /usr/local/cuda 1001- /opt/cuda 1002 PATH_SUFFIXES 1003 lib/x86_64 1004 lib/x64 1005diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake 1006index a842756fcf..a02a66eb60 100644 1007--- a/Modules/FindOpenGL.cmake 1008+++ b/Modules/FindOpenGL.cmake 1009@@ -271,12 +271,7 @@ 1010 set(_OPENGL_INCLUDE_PATH 1011 /boot/develop/headers/os/opengl) 1012 elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux") 1013- # CMake doesn't support arbitrary globs in search paths. 1014- file(GLOB _OPENGL_LIB_PATH 1015- # The NVidia driver installation tool on Linux installs libraries to a 1016- # `nvidia-<version>` subdirectory. 1017- "/usr/lib/nvidia-*" 1018- "/usr/lib32/nvidia-*") 1019+ set(_OPENGL_LIB_PATH) 1020 endif() 1021 1022 # The first line below is to make sure that the proper headers 1023@@ -287,9 +282,6 @@ 1024 # Make sure the NVIDIA directory comes BEFORE the others. 1025 # - Atanas Georgiev <atanas@cs.columbia.edu> 1026 find_path(OPENGL_INCLUDE_DIR GL/gl.h 1027- /usr/share/doc/NVIDIA_GLX-1.0/include 1028- /usr/openwin/share/include 1029- /opt/graphics/OpenGL/include 1030 ${_OPENGL_INCLUDE_PATH} 1031 ) 1032 find_path(OPENGL_GLX_INCLUDE_DIR GL/glx.h ${_OPENGL_INCLUDE_PATH}) 1033@@ -297,9 +289,6 @@ 1034 find_path(OPENGL_GLES2_INCLUDE_DIR GLES2/gl2.h ${_OPENGL_INCLUDE_PATH}) 1035 find_path(OPENGL_GLES3_INCLUDE_DIR GLES3/gl3.h ${_OPENGL_INCLUDE_PATH}) 1036 find_path(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h 1037- /usr/share/doc/NVIDIA_GLX-1.0/include 1038- /usr/openwin/share/include 1039- /opt/graphics/OpenGL/include 1040 ) 1041 1042 find_path(OPENGL_GLU_INCLUDE_DIR GL/glu.h ${_OPENGL_INCLUDE_PATH}) 1043@@ -347,9 +336,6 @@ 1044 find_library(OPENGL_glu_LIBRARY 1045 NAMES GLU MesaGLU 1046 PATHS ${OPENGL_gl_LIBRARY} 1047- /opt/graphics/OpenGL/lib 1048- /usr/openwin/lib 1049- /usr/shlib 1050 ) 1051 1052 list(APPEND _OpenGL_CACHE_VARS 1053@@ -401,10 +387,7 @@ 1054 # Search for the legacy GL library. 1055 find_library(OPENGL_gl_LIBRARY 1056 NAMES GL MesaGL 1057- PATHS /opt/graphics/OpenGL/lib 1058- /usr/openwin/lib 1059- /usr/shlib 1060- ${_OPENGL_LIB_PATH} 1061+ PATHS ${_OPENGL_LIB_PATH} 1062 PATH_SUFFIXES libglvnd 1063 ) 1064 list(APPEND _OpenGL_CACHE_VARS OPENGL_gl_LIBRARY) 1065@@ -513,9 +496,6 @@ 1066 find_library(OPENGL_glu_LIBRARY 1067 NAMES GLU MesaGLU 1068 PATHS ${OPENGL_gl_LIBRARY} 1069- /opt/graphics/OpenGL/lib 1070- /usr/openwin/lib 1071- /usr/shlib 1072 ) 1073 endif () 1074 1075diff --git a/Modules/FindPHP4.cmake b/Modules/FindPHP4.cmake 1076index edef791cb8..5515f44710 100644 1077--- a/Modules/FindPHP4.cmake 1078+++ b/Modules/FindPHP4.cmake 1079@@ -36,15 +36,9 @@ 1080 #]=======================================================================] 1081 1082 set(PHP4_POSSIBLE_INCLUDE_PATHS 1083- /usr/include/php4 1084- /usr/local/include/php4 1085- /usr/include/php 1086- /usr/local/include/php 1087- /usr/local/apache/php 1088 ) 1089 1090 set(PHP4_POSSIBLE_LIB_PATHS 1091- /usr/lib 1092 ) 1093 1094 find_path(PHP4_FOUND_INCLUDE_PATH main/php.h 1095diff --git a/Modules/FindPerlLibs.cmake b/Modules/FindPerlLibs.cmake 1096index 330700e183..7fc89df6eb 100644 1097--- a/Modules/FindPerlLibs.cmake 1098+++ b/Modules/FindPerlLibs.cmake 1099@@ -141,10 +141,6 @@ 1100 PATHS 1101 "${PERL_UPDATE_ARCHLIB}/CORE" 1102 "${PERL_ARCHLIB}/CORE" 1103- /usr/lib/perl5/${PERL_VERSION_STRING}/${PERL_ARCHNAME}/CORE 1104- /usr/lib/perl/${PERL_VERSION_STRING}/${PERL_ARCHNAME}/CORE 1105- /usr/lib/perl5/${PERL_VERSION_STRING}/CORE 1106- /usr/lib/perl/${PERL_VERSION_STRING}/CORE 1107 ) 1108 1109 ### PERL_LIBRARY 1110@@ -154,10 +150,6 @@ 1111 PATHS 1112 "${PERL_UPDATE_ARCHLIB}/CORE" 1113 "${PERL_ARCHLIB}/CORE" 1114- /usr/lib/perl5/${PERL_VERSION_STRING}/${PERL_ARCHNAME}/CORE 1115- /usr/lib/perl/${PERL_VERSION_STRING}/${PERL_ARCHNAME}/CORE 1116- /usr/lib/perl5/${PERL_VERSION_STRING}/CORE 1117- /usr/lib/perl/${PERL_VERSION_STRING}/CORE 1118 ) 1119 1120 endif () 1121diff --git a/Modules/FindPhysFS.cmake b/Modules/FindPhysFS.cmake 1122index 1894498d9d..03c6e61853 100644 1123--- a/Modules/FindPhysFS.cmake 1124+++ b/Modules/FindPhysFS.cmake 1125@@ -52,10 +52,6 @@ 1126 HINTS 1127 ENV PHYSFSDIR 1128 PATH_SUFFIXES include/physfs include 1129- PATHS 1130- ~/Library/Frameworks 1131- /Library/Frameworks 1132- /opt 1133 ) 1134 1135 find_library(PHYSFS_LIBRARY 1136@@ -63,10 +59,6 @@ 1137 HINTS 1138 ENV PHYSFSDIR 1139 PATH_SUFFIXES lib 1140- PATHS 1141- ~/Library/Frameworks 1142- /Library/Frameworks 1143- /opt 1144 ) 1145 1146 include(FindPackageHandleStandardArgs) 1147diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake 1148index b230eb5ef5..bf7b204406 100644 1149--- a/Modules/FindPkgConfig.cmake 1150+++ b/Modules/FindPkgConfig.cmake 1151@@ -391,7 +391,7 @@ 1152 if(NOT DEFINED CMAKE_SYSTEM_NAME 1153 OR (CMAKE_SYSTEM_NAME MATCHES "^(Linux|GNU)$" 1154 AND NOT CMAKE_CROSSCOMPILING)) 1155- if(EXISTS "/etc/debian_version") # is this a debian system ? 1156+ if(FALSE) # is this a debian system ? 1157 if(CMAKE_LIBRARY_ARCHITECTURE) 1158 list(APPEND _lib_dirs "lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig") 1159 endif() 1160diff --git a/Modules/FindProducer.cmake b/Modules/FindProducer.cmake 1161index 1d034bc207..d176655f46 100644 1162--- a/Modules/FindProducer.cmake 1163+++ b/Modules/FindProducer.cmake 1164@@ -100,9 +100,6 @@ 1165 ENV OSGDIR 1166 PATH_SUFFIXES include 1167 PATHS 1168- ~/Library/Frameworks 1169- /Library/Frameworks 1170- /opt 1171 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT] 1172 [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT] 1173 ) 1174@@ -114,8 +111,6 @@ 1175 ENV OSG_DIR 1176 ENV OSGDIR 1177 PATH_SUFFIXES lib 1178- PATHS 1179- /opt 1180 ) 1181 1182 include(FindPackageHandleStandardArgs) 1183diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake 1184index a9441646d1..28ba743f60 100644 1185--- a/Modules/FindPython/Support.cmake 1186+++ b/Modules/FindPython/Support.cmake 1187@@ -162,9 +162,6 @@ 1188 file(TO_CMAKE_PATH "$ENV{CMAKE_FRAMEWORK_PATH}" _pff_CMAKE_FRAMEWORK_PATH) 1189 set (_pff_frameworks ${CMAKE_FRAMEWORK_PATH} 1190 ${_pff_CMAKE_FRAMEWORK_PATH} 1191- ~/Library/Frameworks 1192- /usr/local/Frameworks 1193- /opt/homebrew/Frameworks 1194 ${CMAKE_SYSTEM_FRAMEWORK_PATH}) 1195 list (REMOVE_DUPLICATES _pff_frameworks) 1196 foreach (_pff_implementation IN LISTS _${_PYTHON_PREFIX}_FIND_IMPLEMENTATIONS) 1197diff --git a/Modules/FindQt.cmake b/Modules/FindQt.cmake 1198index 98cd1e2abf..90ad88365d 100644 1199--- a/Modules/FindQt.cmake 1200+++ b/Modules/FindQt.cmake 1201@@ -63,44 +63,6 @@ 1202 return() 1203 endif() 1204 1205-# look for signs of qt3 installations 1206-file(GLOB GLOB_TEMP_VAR /usr/lib*/qt-3*/bin/qmake /usr/lib*/qt3*/bin/qmake) 1207-if(GLOB_TEMP_VAR) 1208- set(QT3_INSTALLED TRUE) 1209-endif() 1210-set(GLOB_TEMP_VAR) 1211- 1212-file(GLOB GLOB_TEMP_VAR /usr/local/qt-x11-commercial-3*/bin/qmake) 1213-if(GLOB_TEMP_VAR) 1214- set(QT3_INSTALLED TRUE) 1215-endif() 1216-set(GLOB_TEMP_VAR) 1217- 1218-file(GLOB GLOB_TEMP_VAR /usr/local/lib/qt3/bin/qmake) 1219-if(GLOB_TEMP_VAR) 1220- set(QT3_INSTALLED TRUE) 1221-endif() 1222-set(GLOB_TEMP_VAR) 1223- 1224-# look for qt4 installations 1225-file(GLOB GLOB_TEMP_VAR /usr/local/qt-x11-commercial-4*/bin/qmake) 1226-if(GLOB_TEMP_VAR) 1227- set(QT4_INSTALLED TRUE) 1228-endif() 1229-set(GLOB_TEMP_VAR) 1230- 1231-file(GLOB GLOB_TEMP_VAR /usr/local/Trolltech/Qt-4*/bin/qmake) 1232-if(GLOB_TEMP_VAR) 1233- set(QT4_INSTALLED TRUE) 1234-endif() 1235-set(GLOB_TEMP_VAR) 1236- 1237-file(GLOB GLOB_TEMP_VAR /usr/local/lib/qt4/bin/qmake) 1238-if(GLOB_TEMP_VAR) 1239- set(QT4_INSTALLED TRUE) 1240-endif() 1241-set(GLOB_TEMP_VAR) 1242- 1243 if (Qt_FIND_VERSION) 1244 if (Qt_FIND_VERSION MATCHES "^([34])(\\.[0-9]+.*)?$") 1245 set(DESIRED_QT_VERSION ${CMAKE_MATCH_1}) 1246@@ -135,9 +97,6 @@ 1247 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/include/Qt" 1248 ${qt_headers}/Qt 1249 $ENV{QTDIR}/include/Qt 1250- /usr/lib/qt/include/Qt 1251- /usr/share/qt4/include/Qt 1252- /usr/local/include/X11/qt4/Qt 1253 C:/Progra~1/qt/include/Qt 1254 PATH_SUFFIXES qt/include/Qt include/Qt) 1255 1256@@ -152,9 +111,6 @@ 1257 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" 1258 C:/Qt/3.3.3Educational/include 1259 $ENV{QTDIR}/include 1260- /usr/include/qt3/Qt 1261- /usr/share/qt3/include 1262- /usr/local/include/X11/qt3 1263 C:/Progra~1/qt/include 1264 PATH_SUFFIXES qt/include include/qt3) 1265 1266diff --git a/Modules/FindQt3.cmake b/Modules/FindQt3.cmake 1267index 2c62a5f17f..772a8d88f6 100644 1268--- a/Modules/FindQt3.cmake 1269+++ b/Modules/FindQt3.cmake 1270@@ -101,10 +101,6 @@ 1271 endif() 1272 1273 1274-file(GLOB GLOB_PATHS /usr/lib/qt-3*) 1275-foreach(GLOB_PATH ${GLOB_PATHS}) 1276- list(APPEND GLOB_PATHS_BIN "${GLOB_PATH}/bin") 1277-endforeach() 1278 find_path(QT_INCLUDE_DIR 1279 NAMES qt.h 1280 PATHS 1281@@ -112,10 +108,7 @@ 1282 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt" 1283 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" 1284 $ENV{QTDIR}/include 1285- ${GLOB_PATHS} 1286- /usr/share/qt3/include 1287 C:/Progra~1/qt/include 1288- /usr/local/include/X11/qt3 1289 PATH_SUFFIXES lib/qt/include lib/qt3/include include/qt include/qt3 qt/include qt3/include 1290 ) 1291 1292@@ -137,7 +130,6 @@ 1293 set(QT_VERSION_STRING "${qt_version_str}") 1294 endif() 1295 1296-file(GLOB GLOB_PATHS_LIB /usr/lib/qt-3*/lib/) 1297 if (QT_MT_REQUIRED) 1298 find_library(QT_QT_LIBRARY 1299 NAMES 1300@@ -148,8 +140,6 @@ 1301 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]" 1302 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]" 1303 ENV QTDIR 1304- ${GLOB_PATHS_LIB} 1305- /usr/share/qt3 1306 C:/Progra~1/qt 1307 PATH_SUFFIXES 1308 lib lib/qt lib/qt3 qt qt3 qt/lib qt3/lib 1309@@ -166,8 +156,6 @@ 1310 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]" 1311 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]" 1312 ENV QTDIR 1313- ${GLOB_PATHS_LIB} 1314- /usr/share/qt3 1315 C:/Progra~1/qt/lib 1316 PATH_SUFFIXES 1317 lib lib/qt lib/qt3 qt qt3 qt/lib qt3/lib 1318@@ -182,8 +170,6 @@ 1319 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]" 1320 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]" 1321 ENV QTDIR 1322- ${GLOB_PATHS_LIB} 1323- /usr/share/qt3 1324 C:/Progra~1/qt 1325 PATH_SUFFIXES 1326 lib lib/qt lib/qt3 qt qt3 qt/lib qt3/lib 1327@@ -198,8 +184,6 @@ 1328 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/include/Qt" 1329 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt" 1330 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" 1331- ${GLOB_PATHS_BIN} 1332- /usr/share/qt3 1333 C:/Progra~1/qt 1334 PATH_SUFFIXES 1335 bin lib/qt lib/qt3 qt qt3 qt/bin qt3/bin lib/qt/bin lib/qt3/bin 1336@@ -218,8 +202,6 @@ 1337 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/include/Qt" 1338 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt" 1339 "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" 1340- ${GLOB_PATHS_BIN} 1341- /usr/share/qt3 1342 C:/Progra~1/qt 1343 PATH_SUFFIXES 1344 bin lib/qt lib/qt3 qt qt3 qt/bin qt3/bin lib/qt/bin lib/qt3/bin 1345diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake 1346index 18b9e35855..dba9976565 100644 1347--- a/Modules/FindRuby.cmake 1348+++ b/Modules/FindRuby.cmake 1349@@ -367,7 +367,6 @@ 1350 HINTS 1351 ${Ruby_HDR_DIR} 1352 ${Ruby_ARCH_DIR} 1353- /usr/lib/ruby/${_Ruby_VERSION_SHORT}/i586-linux-gnu/ 1354 ) 1355 1356 set(Ruby_INCLUDE_DIRS ${Ruby_INCLUDE_DIR}) 1357diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake 1358index a720dcc3df..73e222a27c 100644 1359--- a/Modules/FindSDL.cmake 1360+++ b/Modules/FindSDL.cmake 1361@@ -214,8 +214,6 @@ 1362 HINTS 1363 ENV SDLDIR 1364 PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX} 1365- PATHS 1366- /opt 1367 ) 1368 endif() 1369 endif() 1370diff --git a/Modules/FindSDL_sound.cmake b/Modules/FindSDL_sound.cmake 1371index 954303f3d3..26a5781e2a 100644 1372--- a/Modules/FindSDL_sound.cmake 1373+++ b/Modules/FindSDL_sound.cmake 1374@@ -292,7 +292,6 @@ 1375 ENV MIKMODDIR 1376 ENV SDLSOUNDDIR 1377 ENV SDLDIR 1378- /opt 1379 PATH_SUFFIXES 1380 lib 1381 ) 1382@@ -309,7 +308,6 @@ 1383 ENV MODPLUGDIR 1384 ENV SDLSOUNDDIR 1385 ENV SDLDIR 1386- /opt 1387 PATH_SUFFIXES 1388 lib 1389 ) 1390@@ -328,7 +326,6 @@ 1391 ENV OGGDIR 1392 ENV SDLSOUNDDIR 1393 ENV SDLDIR 1394- /opt 1395 PATH_SUFFIXES 1396 lib 1397 ) 1398@@ -343,7 +340,6 @@ 1399 ENV VORBISDIR 1400 ENV SDLSOUNDDIR 1401 ENV SDLDIR 1402- /opt 1403 PATH_SUFFIXES 1404 lib 1405 ) 1406@@ -361,7 +357,6 @@ 1407 ENV SMPEGDIR 1408 ENV SDLSOUNDDIR 1409 ENV SDLDIR 1410- /opt 1411 PATH_SUFFIXES 1412 lib 1413 ) 1414@@ -379,7 +374,6 @@ 1415 ENV FLACDIR 1416 ENV SDLSOUNDDIR 1417 ENV SDLDIR 1418- /opt 1419 PATH_SUFFIXES 1420 lib 1421 ) 1422@@ -400,7 +394,6 @@ 1423 ENV SPEEXDIR 1424 ENV SDLSOUNDDIR 1425 ENV SDLDIR 1426- /opt 1427 PATH_SUFFIXES 1428 lib 1429 ) 1430@@ -419,7 +412,6 @@ 1431 ENV SPEEXDIR 1432 ENV SDLSOUNDDIR 1433 ENV SDLDIR 1434- /opt 1435 PATH_SUFFIXES lib 1436 ) 1437 if(OGG_LIBRARY) 1438diff --git a/Modules/FindX11.cmake b/Modules/FindX11.cmake 1439index b2f23bd1dd..9a94529589 100644 1440--- a/Modules/FindX11.cmake 1441+++ b/Modules/FindX11.cmake 1442@@ -138,22 +138,9 @@ 1443 set(CMAKE_REQUIRED_QUIET_SAVE ${CMAKE_REQUIRED_QUIET}) 1444 set(CMAKE_REQUIRED_QUIET ${X11_FIND_QUIETLY}) 1445 set(X11_INC_SEARCH_PATH 1446- /usr/pkg/xorg/include 1447- /usr/X11R6/include 1448- /usr/X11R7/include 1449- /usr/include/X11 1450- /usr/openwin/include 1451- /usr/openwin/share/include 1452- /opt/graphics/OpenGL/include 1453- /opt/X11/include 1454 ) 1455 1456 set(X11_LIB_SEARCH_PATH 1457- /usr/pkg/xorg/lib 1458- /usr/X11R6/lib 1459- /usr/X11R7/lib 1460- /usr/openwin/lib 1461- /opt/X11/lib 1462 ) 1463 1464 find_path(X11_X11_INCLUDE_PATH X11/X.h ${X11_INC_SEARCH_PATH}) 1465diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake 1466index ff9c11a9d7..706b34b087 100644 1467--- a/Modules/GNUInstallDirs.cmake 1468+++ b/Modules/GNUInstallDirs.cmake 1469@@ -336,17 +336,6 @@ 1470 set(${out_var} "conda") 1471 endif() 1472 endif() 1473- # If we didn't detect conda from the previous step, check 1474- # for the linux variant 1475- if(NOT ${out_var}) 1476- if (EXISTS "/etc/alpine-release") 1477- set(${out_var} "alpine") 1478- elseif (EXISTS "/etc/arch-release") 1479- set(${out_var} "arch linux") 1480- elseif (EXISTS "/etc/debian_version") 1481- set(${out_var} "debian") 1482- endif() 1483- endif() 1484 return(PROPAGATE ${out_var}) 1485 endfunction() 1486 1487diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake 1488index f1f5db7b7b..9b4bdddb36 100644 1489--- a/Modules/GetPrerequisites.cmake 1490+++ b/Modules/GetPrerequisites.cmake 1491@@ -458,11 +458,9 @@ 1492 if(NOT resolved) 1493 set(ri "ri-NOTFOUND") 1494 find_file(ri "${item}" ${exepath} ${dirs} NO_DEFAULT_PATH) 1495- find_file(ri "${item}" ${exepath} ${dirs} /usr/lib) 1496 1497 get_filename_component(basename_item "${item}" NAME) 1498 find_file(ri "${basename_item}" PATHS ${exepath} ${dirs} NO_DEFAULT_PATH) 1499- find_file(ri "${basename_item}" PATHS /usr/lib) 1500 1501 if(ri) 1502 #message(STATUS "info: 'find_file' in exepath/dirs (${ri})") 1503@@ -472,23 +470,6 @@ 1504 endif() 1505 endif() 1506 1507- if(NOT resolved) 1508- if(item MATCHES "[^/]+\\.framework/") 1509- set(fw "fw-NOTFOUND") 1510- find_file(fw "${item}" 1511- "~/Library/Frameworks" 1512- "/Library/Frameworks" 1513- "/System/Library/Frameworks" 1514- ) 1515- if(fw) 1516- #message(STATUS "info: 'find_file' found framework (${fw})") 1517- set(resolved 1) 1518- set(resolved_item "${fw}") 1519- set(fw "fw-NOTFOUND") 1520- endif() 1521- endif() 1522- endif() 1523- 1524 # Using find_program on Windows will find dll files that are in the PATH. 1525 # (Converting simple file names into full path names if found.) 1526 # 1527diff --git a/Modules/Internal/CMakeCUDAFindToolkit.cmake b/Modules/Internal/CMakeCUDAFindToolkit.cmake 1528index 8fd408994f..61894813a2 100644 1529--- a/Modules/Internal/CMakeCUDAFindToolkit.cmake 1530+++ b/Modules/Internal/CMakeCUDAFindToolkit.cmake 1531@@ -50,18 +50,8 @@ 1532 # if CUDAToolkit_ROOT is not specified, it is assumed that the symlinked 1533 # directory is the desired location. 1534 if(NOT _CUDA_NVCC_EXECUTABLE) 1535- if(UNIX) 1536- if(NOT APPLE) 1537- set(platform_base "/usr/local/cuda-") 1538- else() 1539- set(platform_base "/Developer/NVIDIA/CUDA-") 1540- endif() 1541- else() 1542- set(platform_base "C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v") 1543- endif() 1544- 1545 # Build out a descending list of possible cuda installations, e.g. 1546- file(GLOB possible_paths "${platform_base}*") 1547+ set(possible_paths) 1548 # Iterate the glob results and create a descending list. 1549 set(versions) 1550 foreach(p ${possible_paths}) 1551@@ -77,14 +67,6 @@ 1552 1553 # With a descending list of versions, populate possible paths to search. 1554 set(search_paths) 1555- foreach(v ${versions}) 1556- list(APPEND search_paths "${platform_base}${v}") 1557- endforeach() 1558- 1559- # Force the global default /usr/local/cuda to the front on Unix. 1560- if(UNIX) 1561- list(INSERT search_paths 0 "/usr/local/cuda") 1562- endif() 1563 1564 # Now search for nvcc again using the platform default search paths. 1565 find_program(_CUDA_NVCC_EXECUTABLE 1566@@ -140,23 +122,13 @@ 1567 set(${lang_var_}LIBRARY_ROOT "${_CUDA_COMPILER_LIBRARY_ROOT_FROM_NVVMIR_LIBRARY_DIR}") 1568 elseif(EXISTS "${${lang_var_}TOOLKIT_ROOT}/nvvm/libdevice") 1569 set(${lang_var_}LIBRARY_ROOT "${${lang_var_}TOOLKIT_ROOT}") 1570- elseif(CMAKE_SYSROOT_LINK AND EXISTS "${CMAKE_SYSROOT_LINK}/usr/lib/cuda/nvvm/libdevice") 1571- set(${lang_var_}LIBRARY_ROOT "${CMAKE_SYSROOT_LINK}/usr/lib/cuda") 1572- elseif(EXISTS "${CMAKE_SYSROOT}/usr/lib/cuda/nvvm/libdevice") 1573- set(${lang_var_}LIBRARY_ROOT "${CMAKE_SYSROOT}/usr/lib/cuda") 1574 else() 1575 message(FATAL_ERROR "Couldn't find CUDA library root.") 1576 endif() 1577 unset(_CUDA_COMPILER_LIBRARY_ROOT_FROM_NVVMIR_LIBRARY_DIR) 1578 1579 # ${lang_var_}TOOLKIT_LIBRARY_ROOT contains the linking stubs necessary for device linking and other low-level library files. 1580- if(CMAKE_SYSROOT_LINK AND EXISTS "${CMAKE_SYSROOT_LINK}/usr/lib/nvidia-cuda-toolkit/bin/crt/link.stub") 1581- set(${lang_var_}TOOLKIT_LIBRARY_ROOT "${CMAKE_SYSROOT_LINK}/usr/lib/nvidia-cuda-toolkit") 1582- elseif(EXISTS "${CMAKE_SYSROOT}/usr/lib/nvidia-cuda-toolkit/bin/crt/link.stub") 1583- set(${lang_var_}TOOLKIT_LIBRARY_ROOT "${CMAKE_SYSROOT}/usr/lib/nvidia-cuda-toolkit") 1584- else() 1585- set(${lang_var_}TOOLKIT_LIBRARY_ROOT "${${lang_var_}TOOLKIT_ROOT}") 1586- endif() 1587+ set(${lang_var_}TOOLKIT_LIBRARY_ROOT "${${lang_var_}TOOLKIT_ROOT}") 1588 1589 # For regular nvcc we the toolkit version is the same as the compiler version and we can parse it from the vendor test output. 1590 # For Clang we need to invoke nvcc to get version output. 1591diff --git a/Modules/Internal/CPack/CPackRPM.cmake b/Modules/Internal/CPack/CPackRPM.cmake 1592index b733cfe964..90709f48e8 100644 1593--- a/Modules/Internal/CPack/CPackRPM.cmake 1594+++ b/Modules/Internal/CPack/CPackRPM.cmake 1595@@ -640,7 +640,7 @@ 1596 endif() 1597 1598 # With debugedit we prepare source files list 1599- find_program(DEBUGEDIT_EXECUTABLE debugedit "/usr/lib/rpm/") 1600+ find_program(DEBUGEDIT_EXECUTABLE debugedit) 1601 if(NOT DEBUGEDIT_EXECUTABLE) 1602 message(FATAL_ERROR "CPackRPM: debugedit binary could not be found!" 1603 " Required for debuginfo packaging. See documentation of" 1604diff --git a/Modules/Platform/CYGWIN.cmake b/Modules/Platform/CYGWIN.cmake 1605index cf5e732833..1bbbfeca54 100644 1606--- a/Modules/Platform/CYGWIN.cmake 1607+++ b/Modules/Platform/CYGWIN.cmake 1608@@ -15,13 +15,3 @@ 1609 set(CMAKE_SHARED_LIBRARY_NAME_WITH_VERSION 1) 1610 1611 include(Platform/UnixPaths) 1612- 1613-# Windows API on Cygwin 1614-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH 1615- /usr/include/w32api 1616- ) 1617- 1618-# Windows API on Cygwin 1619-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH 1620- /usr/lib/w32api 1621- ) 1622diff --git a/Modules/Platform/Darwin-Initialize.cmake b/Modules/Platform/Darwin-Initialize.cmake 1623index 7c4f123a1d..4cfd53de9f 100644 1624--- a/Modules/Platform/Darwin-Initialize.cmake 1625+++ b/Modules/Platform/Darwin-Initialize.cmake 1626@@ -1,19 +1,7 @@ 1627 set(APPLE 1) 1628 set(UNIX 1) 1629 1630-# Ask xcode-select where to find /Developer or fall back to ancient location. 1631-execute_process(COMMAND xcode-select -print-path 1632- OUTPUT_VARIABLE _stdout 1633- OUTPUT_STRIP_TRAILING_WHITESPACE 1634- ERROR_VARIABLE _stderr 1635- RESULT_VARIABLE _failed) 1636-if(NOT _failed AND IS_DIRECTORY ${_stdout}) 1637- set(OSX_DEVELOPER_ROOT ${_stdout}) 1638-elseif(IS_DIRECTORY "/Developer") 1639- set(OSX_DEVELOPER_ROOT "/Developer") 1640-else() 1641- set(OSX_DEVELOPER_ROOT "") 1642-endif() 1643+set(OSX_DEVELOPER_ROOT "") 1644 1645 if(NOT CMAKE_CROSSCOMPILING) 1646 execute_process(COMMAND @sw_vers@ -productVersion 1647diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake 1648index 42c6b35424..f2985f3765 100644 1649--- a/Modules/Platform/Darwin.cmake 1650+++ b/Modules/Platform/Darwin.cmake 1651@@ -166,7 +166,6 @@ 1652 1653 # set up the default search directories for frameworks 1654 set(CMAKE_SYSTEM_FRAMEWORK_PATH 1655- ~/Library/Frameworks 1656 ) 1657 if(_CMAKE_OSX_SYSROOT_PATH) 1658 list(APPEND CMAKE_SYSTEM_FRAMEWORK_PATH 1659@@ -201,10 +200,6 @@ 1660 list(APPEND CMAKE_SYSTEM_FRAMEWORK_PATH 1661 ${OSX_DEVELOPER_ROOT}/Library/Frameworks) 1662 endif() 1663-list(APPEND CMAKE_SYSTEM_FRAMEWORK_PATH 1664- /Library/Frameworks 1665- /Network/Library/Frameworks 1666- /System/Library/Frameworks) 1667 1668 # Warn about known system misconfiguration case. 1669 if(CMAKE_OSX_SYSROOT) 1670@@ -230,10 +225,6 @@ 1671 # set up the default search directories for application bundles 1672 set(_apps_paths) 1673 foreach(_path 1674- "~/Applications" 1675- "/Applications" 1676- "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+ 1677- "${OSX_DEVELOPER_ROOT}/Applications" # pre-4.3 1678 ) 1679 get_filename_component(_apps "${_path}" ABSOLUTE) 1680 if(EXISTS "${_apps}") 1681@@ -249,28 +240,6 @@ 1682 1683 include(Platform/UnixPaths) 1684 1685-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") 1686- execute_process( 1687- COMMAND brew --prefix 1688- OUTPUT_VARIABLE _cmake_homebrew_prefix 1689- RESULT_VARIABLE _brew_result 1690- OUTPUT_STRIP_TRAILING_WHITESPACE 1691- ) 1692- if (_brew_result EQUAL 0 AND IS_DIRECTORY "${_cmake_homebrew_prefix}") 1693- list(PREPEND CMAKE_SYSTEM_PREFIX_PATH "${_cmake_homebrew_prefix}") 1694- elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") 1695- list(PREPEND CMAKE_SYSTEM_PREFIX_PATH 1696- /opt/homebrew # Brew on Apple Silicon 1697- ) 1698- else() 1699- list(PREPEND CMAKE_SYSTEM_PREFIX_PATH 1700- /usr/local # Brew on Intel 1701- ) 1702- endif() 1703- unset(_cmake_homebrew_prefix) 1704- unset(_brew_result) 1705-endif() 1706- 1707 if(_CMAKE_OSX_SYSROOT_PATH) 1708 if(EXISTS ${_CMAKE_OSX_SYSROOT_PATH}/usr/include) 1709 list(INSERT CMAKE_SYSTEM_PREFIX_PATH 0 ${_CMAKE_OSX_SYSROOT_PATH}/usr) 1710@@ -285,7 +254,3 @@ 1711 endforeach() 1712 endif() 1713 endif() 1714-list(APPEND CMAKE_SYSTEM_PREFIX_PATH 1715- /sw # Fink 1716- /opt/local # MacPorts 1717- ) 1718diff --git a/Modules/Platform/GNU.cmake b/Modules/Platform/GNU.cmake 1719index 6a25b00b81..2430bdb7e4 100644 1720--- a/Modules/Platform/GNU.cmake 1721+++ b/Modules/Platform/GNU.cmake 1722@@ -48,13 +48,8 @@ 1723 # checking the platform every time. This option is advanced enough 1724 # that only package maintainers should need to adjust it. They are 1725 # capable of providing a setting on the command line. 1726- if(EXISTS "/etc/debian_version") 1727- set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL 1728- "Install .so files without execute permission.") 1729- else() 1730- set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL 1731- "Install .so files without execute permission.") 1732- endif() 1733+ set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL 1734+ "Install .so files without execute permission.") 1735 endif() 1736 1737 include(Platform/UnixPaths) 1738diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake 1739index 5b61dd6b61..d324b903ed 100644 1740--- a/Modules/Platform/Linux.cmake 1741+++ b/Modules/Platform/Linux.cmake 1742@@ -45,25 +45,8 @@ 1743 # checking the platform every time. This option is advanced enough 1744 # that only package maintainers should need to adjust it. They are 1745 # capable of providing a setting on the command line. 1746- if(EXISTS "/etc/debian_version") 1747- set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL 1748- "Install .so files without execute permission.") 1749- else() 1750- set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL 1751- "Install .so files without execute permission.") 1752- endif() 1753+ set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL 1754+ "Install .so files without execute permission.") 1755 endif() 1756 1757 include(Platform/UnixPaths) 1758- 1759-# Debian has lib32 and lib64 paths only for compatibility so they should not be 1760-# searched. 1761-if(NOT CMAKE_CROSSCOMPILING AND NOT CMAKE_COMPILER_SYSROOT) 1762- if (EXISTS "/etc/debian_version") 1763- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS FALSE) 1764- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) 1765- endif() 1766- if (EXISTS "/etc/arch-release") 1767- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) 1768- endif() 1769-endif() 1770diff --git a/Modules/Platform/OpenBSD.cmake b/Modules/Platform/OpenBSD.cmake 1771index 97e2a6a83e..02c607618c 100644 1772--- a/Modules/Platform/OpenBSD.cmake 1773+++ b/Modules/Platform/OpenBSD.cmake 1774@@ -31,13 +31,9 @@ 1775 1776 if($ENV{LOCALBASE}) 1777 set(OPENBSD_LOCALBASE $ENV{LOCALBASE}) 1778-else() 1779- set(OPENBSD_LOCALBASE /usr/local) 1780 endif() 1781 if($ENV{X11BASE}) 1782 set(OPENBSD_X11BASE $ENV{X11BASE}) 1783-else() 1784- set(OPENBSD_X11BASE /usr/X11R6) 1785 endif() 1786 1787 list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${OPENBSD_LOCALBASE}) 1788diff --git a/Modules/Platform/SunOS.cmake b/Modules/Platform/SunOS.cmake 1789index e01e892283..d044d81c88 100644 1790--- a/Modules/Platform/SunOS.cmake 1791+++ b/Modules/Platform/SunOS.cmake 1792@@ -19,11 +19,6 @@ 1793 1794 include(Platform/UnixPaths) 1795 1796-list(APPEND CMAKE_SYSTEM_PREFIX_PATH 1797- /opt/csw 1798- /opt/openwin 1799- ) 1800- 1801 # The Sun linker needs to find transitive shared library dependencies 1802 # in the -L path. 1803 set(CMAKE_LINK_DEPENDENT_LIBRARY_DIRS 1) 1804diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake 1805index bdf4155232..588064821d 100644 1806--- a/Modules/Platform/UnixPaths.cmake 1807+++ b/Modules/Platform/UnixPaths.cmake 1808@@ -29,9 +29,6 @@ 1809 # please make sure to keep Help/variable/CMAKE_SYSTEM_PREFIX_PATH.rst 1810 # synchronized 1811 list(APPEND CMAKE_SYSTEM_PREFIX_PATH 1812- # Standard 1813- /usr/local /usr / 1814- 1815 # CMake install location 1816 "${_CMAKE_INSTALL_DIR}" 1817 ) 1818@@ -49,28 +46,6 @@ 1819 endif() 1820 _cmake_record_install_prefix() 1821 1822-# Non "standard" but common install prefixes 1823-list(APPEND CMAKE_SYSTEM_PREFIX_PATH 1824- /usr/X11R6 1825- /usr/pkg 1826- /opt 1827- ) 1828- 1829-# List common include file locations not under the common prefixes. 1830-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH 1831- # X11 1832- /usr/include/X11 1833- ) 1834- 1835-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH 1836- # X11 1837- /usr/lib/X11 1838- ) 1839- 1840-list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES 1841- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64 1842- ) 1843- 1844 # Add the Nix C library paths. 1845 if(DEFINED ENV{NIX_CC} 1846 AND IS_DIRECTORY "$ENV{NIX_CC}" 1847diff --git a/Modules/Platform/WindowsPaths.cmake b/Modules/Platform/WindowsPaths.cmake 1848index c56dfaf9ac..4e0b250c1a 100644 1849--- a/Modules/Platform/WindowsPaths.cmake 1850+++ b/Modules/Platform/WindowsPaths.cmake 1851@@ -69,11 +69,6 @@ 1852 endif() 1853 _cmake_record_install_prefix() 1854 1855-if(CMAKE_CROSSCOMPILING AND NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Windows") 1856- # MinGW (useful when cross compiling from linux with CMAKE_FIND_ROOT_PATH set) 1857- list(APPEND CMAKE_SYSTEM_PREFIX_PATH /) 1858-endif() 1859- 1860 list(APPEND CMAKE_SYSTEM_INCLUDE_PATH 1861 ) 1862 1863diff --git a/Modules/ProcessorCount.cmake b/Modules/ProcessorCount.cmake 1864index ffb8fcd8d2..6b8fcf87dc 100644 1865--- a/Modules/ProcessorCount.cmake 1866+++ b/Modules/ProcessorCount.cmake 1867@@ -128,7 +128,7 @@ 1868 if(NOT count) 1869 # HPUX (systems with machinfo): 1870 find_program(ProcessorCount_cmd_machinfo machinfo 1871- PATHS /usr/contrib/bin) 1872+ ) 1873 mark_as_advanced(ProcessorCount_cmd_machinfo) 1874 if(ProcessorCount_cmd_machinfo) 1875 execute_process(COMMAND ${ProcessorCount_cmd_machinfo} 1876@@ -160,7 +160,7 @@ 1877 if(NOT count) 1878 # AIX (systems with lsconf): 1879 find_program(ProcessorCount_cmd_lsconf lsconf 1880- PATHS /usr/sbin) 1881+ ) 1882 mark_as_advanced(ProcessorCount_cmd_lsconf) 1883 if(ProcessorCount_cmd_lsconf) 1884 execute_process(COMMAND ${ProcessorCount_cmd_lsconf} 1885@@ -190,7 +190,7 @@ 1886 1887 if(NOT count) 1888 # Sun (systems where psrinfo tool is available) 1889- find_program(ProcessorCount_cmd_psrinfo psrinfo PATHS /usr/sbin /sbin) 1890+ find_program(ProcessorCount_cmd_psrinfo psrinfo) 1891 mark_as_advanced(ProcessorCount_cmd_psrinfo) 1892 if (ProcessorCount_cmd_psrinfo) 1893 execute_process(COMMAND ${ProcessorCount_cmd_psrinfo} -p -v 1894diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake 1895index b977d955ca..5ff835298d 100644 1896--- a/Modules/UseJava.cmake 1897+++ b/Modules/UseJava.cmake 1898@@ -1125,8 +1125,6 @@ 1899 set(_jar_files) 1900 set(_jar_versions) 1901 set(_jar_paths 1902- /usr/share/java/ 1903- /usr/local/share/java/ 1904 ${Java_JAR_PATHS}) 1905 set(_jar_doc "NOTSET") 1906 1907diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt 1908index 8ff651fd90..9659deedf5 100644 1909--- a/Utilities/cmcurl/CMakeLists.txt 1910+++ b/Utilities/cmcurl/CMakeLists.txt 1911@@ -1826,43 +1826,6 @@ 1912 endif() 1913 mark_as_advanced(CURL_CA_PATH_SET) 1914 1915- if(CURL_CA_BUNDLE_SET AND _curl_ca_path_autodetect) 1916- # Skip auto-detection of unset CA path because CA bundle is set explicitly 1917- elseif(CURL_CA_PATH_SET AND _curl_ca_bundle_autodetect) 1918- # Skip auto-detection of unset CA bundle because CA path is set explicitly 1919- elseif(_curl_ca_bundle_autodetect OR _curl_ca_path_autodetect) 1920- # First try auto-detecting a CA bundle, then a CA path 1921- 1922- if(_curl_ca_bundle_autodetect) 1923- foreach(_search_ca_bundle_path IN ITEMS 1924- "/etc/ssl/certs/ca-certificates.crt" 1925- "/etc/pki/tls/certs/ca-bundle.crt" 1926- "/usr/share/ssl/certs/ca-bundle.crt" 1927- "/usr/local/share/certs/ca-root-nss.crt" 1928- "/etc/ssl/cert.pem") 1929- if(EXISTS "${_search_ca_bundle_path}") 1930- message(STATUS "Found CA bundle: ${_search_ca_bundle_path}") 1931- set(CURL_CA_BUNDLE "${_search_ca_bundle_path}" CACHE 1932- STRING "Path to the CA bundle. Set 'none' to disable or 'auto' for auto-detection. Defaults to 'auto'.") 1933- set(CURL_CA_BUNDLE_SET TRUE CACHE BOOL "Path to the CA bundle has been set") 1934- break() 1935- endif() 1936- endforeach() 1937- endif() 1938- 1939- if(_curl_ca_path_autodetect AND NOT CURL_CA_PATH_SET) 1940- set(_search_ca_path "/etc/ssl/certs") 1941- file(GLOB _curl_ca_files_found "${_search_ca_path}/[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f].0") 1942- if(_curl_ca_files_found) 1943- unset(_curl_ca_files_found) 1944- message(STATUS "Found CA path: ${_search_ca_path}") 1945- set(CURL_CA_PATH "${_search_ca_path}" CACHE 1946- STRING "Location of default CA path. Set 'none' to disable or 'auto' for auto-detection. Defaults to 'auto'.") 1947- set(CURL_CA_PATH_SET TRUE CACHE BOOL "Path to the CA bundle has been set") 1948- endif() 1949- endif() 1950- endif() 1951- 1952 set(CURL_CA_EMBED_SET FALSE) 1953 if(BUILD_CURL_EXE AND NOT CURL_CA_EMBED STREQUAL "") 1954 if(EXISTS "${CURL_CA_EMBED}") 1955diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt 1956index e6ab5de99b..158a407c3e 100644 1957--- a/Utilities/cmlibarchive/CMakeLists.txt 1958+++ b/Utilities/cmlibarchive/CMakeLists.txt 1959@@ -39,9 +39,6 @@ 1960 MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL|NONE)\$") 1961 ENDIF() 1962 1963-# On MacOS, prefer MacPorts libraries to system libraries. 1964-# I haven't come up with a compelling argument for this to be conditional. 1965-list(APPEND CMAKE_PREFIX_PATH /opt/local) 1966 # Enable @rpath in the install name. 1967 # detail in "cmake --help-policy CMP0042" 1968 SET(CMAKE_MACOSX_RPATH ON)