Skip to content

Commit d4aeb01

Browse files
committed
[cmake] do not force-enable if user set feature explicitly to OFF
1 parent 1578e43 commit d4aeb01

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

cmake/modules/SearchInstalledSoftware.cmake

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ if(mathmore OR builtin_gsl OR (tmva-cpu AND use_gsl_cblas))
644644
set(GSL_INCLUDE_DIR ${CMAKE_BINARY_DIR}/GSL-prefix/src/GSL-build)
645645
set(GSL_FOUND ON)
646646
if(NOT mathmore)
647-
set(mathmore ON CACHE BOOL "Enabled because builtin_gls requested (${mathmore_description})" FORCE)
647+
set(mathmore ON CACHE BOOL "Enabled because builtin_gls requested (${mathmore_description})")
648648
endif()
649649
endif()
650650
endif()
@@ -694,7 +694,7 @@ endif()
694694
if(NOT WIN32 AND NOT APPLE)
695695
if(opengl AND NOT x11)
696696
message(STATUS "OpenGL was disabled, since it is requires x11 on Linux")
697-
set(opengl OFF CACHE BOOL "OpenGL requires x11" FORCE)
697+
set(opengl OFF CACHE BOOL "Disabled because OpenGL requires x11" FORCE)
698698
endif()
699699
endif()
700700
# The opengl flag enables the graf3d features that depend on OpenGL, and these
@@ -932,7 +932,7 @@ if(fftw3)
932932
endif()
933933
if(builtin_fftw3)
934934
if(NOT fftw3)
935-
set(fftw3 ON CACHE BOOL "Enabled because builtin_fftw3 requested (${fftw3_description})" FORCE)
935+
set(fftw3 ON CACHE BOOL "Enabled because builtin_fftw3 requested (${fftw3_description})")
936936
endif()
937937
set(FFTW_VERSION 3.3.8)
938938
message(STATUS "Downloading and building FFTW version ${FFTW_VERSION}")
@@ -960,7 +960,7 @@ if(fitsio OR builtin_cfitsio)
960960
endif()
961961
if(builtin_cfitsio)
962962
if(NOT fitsio)
963-
set(fitsio ON CACHE BOOL "Enabled because builtin_cfitsio requested (${fitsio_description})" FORCE)
963+
set(fitsio ON CACHE BOOL "Enabled because builtin_cfitsio requested (${fitsio_description})")
964964
endif()
965965
add_library(CFITSIO::CFITSIO STATIC IMPORTED GLOBAL)
966966
add_subdirectory(builtins/cfitsio)
@@ -1025,7 +1025,7 @@ endif()
10251025

10261026
if(builtin_xrootd)
10271027
if(NOT xrootd)
1028-
set(xrootd ON CACHE BOOL "Enabled because builtin_xrootd requested (${xrootd_description})" FORCE)
1028+
set(xrootd ON CACHE BOOL "Enabled because builtin_xrootd requested (${xrootd_description})")
10291029
endif()
10301030
ROOT_CHECK_CONNECTION("builtin_xrootd=OFF")
10311031
if(NO_CONNECTION)
@@ -1198,7 +1198,7 @@ endif()
11981198

11991199
if(builtin_davix)
12001200
if(NOT davix)
1201-
set(davix ON CACHE BOOL "Enabled because builtin_davix is enabled (${davix_description})" FORCE)
1201+
set(davix ON CACHE BOOL "Enabled because builtin_davix is enabled (${davix_description})")
12021202
endif()
12031203
ROOT_CHECK_CONNECTION("builtin_davix=OFF")
12041204
if(NO_CONNECTION)
@@ -1302,7 +1302,7 @@ endif()
13021302

13031303
if(builtin_tbb)
13041304
if(NOT imt)
1305-
set(imt ON CACHE BOOL "Enabled because builtin_tbb is enabled (${imt_description})" FORCE)
1305+
set(imt ON CACHE BOOL "Enabled because builtin_tbb is enabled (${imt_description})")
13061306
endif()
13071307
ROOT_CHECK_CONNECTION("builtin_tbb=OFF")
13081308
if(NO_CONNECTION)
@@ -1388,7 +1388,7 @@ if(builtin_vc)
13881388
unset(Vc_FOUND)
13891389
unset(Vc_FOUND CACHE)
13901390
if(NOT vc)
1391-
set(vc ON CACHE BOOL "Enabled because builtin_vc requested (${vc_description})" FORCE)
1391+
set(vc ON CACHE BOOL "Enabled because builtin_vc requested (${vc_description})")
13921392
endif()
13931393
elseif(vc)
13941394
if(fail-on-missing)
@@ -1480,7 +1480,7 @@ if(builtin_veccore)
14801480
unset(VecCore_FOUND)
14811481
unset(VecCore_FOUND CACHE)
14821482
if(NOT vc)
1483-
set(veccore ON CACHE BOOL "Enabled because builtin_veccore requested (${veccore_description})" FORCE)
1483+
set(veccore ON CACHE BOOL "Enabled because builtin_veccore requested (${veccore_description})")
14841484
endif()
14851485
elseif(veccore)
14861486
if(vc)
@@ -1600,7 +1600,7 @@ if(vdt OR builtin_vdt)
16001600
endif()
16011601
if(builtin_vdt)
16021602
if(NOT vdt)
1603-
set(vdt ON CACHE BOOL "Enabled because builtin_vdt enabled (${vdt_description})" FORCE)
1603+
set(vdt ON CACHE BOOL "Enabled because builtin_vdt enabled (${vdt_description})")
16041604
endif()
16051605
set(vdt_version 0.4.6)
16061606
set(VDT_FOUND True)

0 commit comments

Comments
 (0)