-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[CMake] Remove
builtin_libafterimage
option
The option was deprecated in ROOT 6.32 and should be removed for the next release, as anticipated by the deprecation warnings in 6.32.
- Loading branch information
1 parent
11accb8
commit 0992621
Showing
5 changed files
with
2 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -80,7 +80,6 @@ endfunction() | |
ROOT_BUILD_OPTION(arrow OFF "Enable support for Apache Arrow") | ||
ROOT_BUILD_OPTION(asimage ON "Enable support for image processing via libAfterImage") | ||
ROOT_BUILD_OPTION(asserts OFF "Enable asserts (defaults to ON for CMAKE_BUILD_TYPE=Debug and/or dev=ON)") | ||
ROOT_BUILD_OPTION(builtin_afterimage ON "Build bundled copy of libAfterImage (flag is deprecated, this should be always enabled)") | ||
ROOT_BUILD_OPTION(builtin_cfitsio OFF "Build CFITSIO internally (requires network)") | ||
ROOT_BUILD_OPTION(builtin_clang ON "Build bundled copy of Clang") | ||
ROOT_BUILD_OPTION(builtin_cling ON "Build bundled copy of Cling. Only build with an external cling if you know what you are doing: associating ROOT commits with cling commits is tricky.") | ||
|
@@ -269,7 +268,6 @@ endif() | |
|
||
#--- The 'builtin_all' option switches ON all the built in options but GPL------------------------------- | ||
if(builtin_all) | ||
set(builtin_afterimage_defvalue ON) | ||
set(builtin_cfitsio_defvalue ON) | ||
set(builtin_clang_defvalue ON) | ||
set(builtin_cling_defvalue ON) | ||
|
@@ -412,10 +410,6 @@ foreach(opt cxxmodules) | |
endforeach() | ||
|
||
|
||
if(cocoa OR x11 AND NOT builtin_afterimage) | ||
message(DEPRECATION ">>> Option builtin_afterimage is deprecated: in the future it will always be set to ON. In the next release of ROOT, you will no longer be able to disable this feature. Please contact [email protected] should you still need disabling it.") | ||
endif() | ||
|
||
foreach(opt minuit2_omp minuit2_mpi) | ||
if(${opt}) | ||
message(WARNING "The option '${opt}' can only be used to minimise thread-safe functions in Minuit2. It cannot be used for Histogram/Graph fitting and for RooFit. If you want to use Minuit2 with OpenMP or MPI support, it is better to build Minuit2 as a standalone library.") | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Shouldn't this become if(asimage) ? Do we ever want to build afterimage if asimage is disabled?