Skip to content

Commit

Permalink
[CMake] Remove builtin_libafterimage option
Browse files Browse the repository at this point in the history
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
guitargeek committed Apr 5, 2024
1 parent 11accb8 commit 0992621
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 24 deletions.
1 change: 0 additions & 1 deletion .github/workflows/root-ci-config/buildconfig/global.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ arrow=OFF
asan=OFF
asimage=ON
asserts=OFF
builtin_afterimage=ON
builtin_cfitsio=OFF
builtin_clang=ON
builtin_cling=ON
Expand Down
6 changes: 0 additions & 6 deletions cmake/modules/RootBuildOptions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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.")
Expand Down
1 change: 0 additions & 1 deletion cmake/modules/RootConfiguration.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,6 @@ set(arrowlib ${ARROW_LIBRARY})
set(arrowincdir ${ARROW_INCLUDE_DIR})

set(buildasimage ${value${asimage}})
set(builtinafterimage ${builtin_afterimage})
set(asextralib ${ASEXTRA_LIBRARIES})
set(asextralibdir)
set(asjpegincdir ${JPEG_INCLUDE_DIR})
Expand Down
17 changes: 2 additions & 15 deletions cmake/modules/SearchInstalledSoftware.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -408,21 +408,8 @@ if(asimage)
endif()
endif()

#---Check for AfterImage---------------------------------------------------------------
if(asimage AND NOT builtin_afterimage)
message(STATUS "Looking for AfterImage")
if(fail-on-missing)
find_package(AfterImage REQUIRED)
else()
find_package(AfterImage)
if(NOT AFTERIMAGE_FOUND)
message(STATUS "AfterImage not found. Switching on builtin_afterimage option")
set(builtin_afterimage ON CACHE BOOL "Enabled because asimage requested and AfterImage not found (${builtin_afterimage_description})" FORCE)
endif()
endif()
endif()

if(builtin_afterimage)
#---AfterImage---------------------------------------------------------------
if(TRUE)

This comment has been minimized.

Copy link
@ferdymercury

ferdymercury Apr 10, 2024

Contributor

Shouldn't this become if(asimage) ? Do we ever want to build afterimage if asimage is disabled?

set(AFTERIMAGE_LIBRARIES ${CMAKE_BINARY_DIR}/lib/libAfterImage${CMAKE_STATIC_LIBRARY_SUFFIX})
if(WIN32)
if(winrtdebug)
Expand Down
1 change: 0 additions & 1 deletion config/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,6 @@ SRMIFCEINCDIR := $(filter-out /usr/include, @srmifceincdir@)
GLIB2INCDIR := $(filter-out /usr/include, @glib2incdir@)

BUILDASIMAGE := @buildasimage@
BUILTINASIMAGE := @builtinafterimage@
ASEXTRALIB := @asextralib@
ASEXTRALIBDIR := @asextralibdir@
ASJPEGINCDIR := $(filter-out /usr/include, @asjpegincdir@)
Expand Down

0 comments on commit 0992621

Please sign in to comment.