Skip to content

Commit 922311a

Browse files
committed
Delete net/monalisa directory
`-Dmonalisa=ON` was deprecated in ROOT 6.28 and throws an error since version 6.30.
1 parent 1f86c24 commit 922311a

File tree

14 files changed

+0
-1511
lines changed

14 files changed

+0
-1511
lines changed

.github/workflows/root-ci-config/buildconfig/global.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ macos_native=OFF
6565
mathmore=ON
6666
memory_termination=OFF
6767
minimal=OFF
68-
monalisa=OFF
6968
mpi=OFF
7069
mysql=ON
7170
odbc=OFF

README/README.MONALISA

Lines changed: 0 additions & 74 deletions
This file was deleted.

cmake/modules/FindMonalisa.cmake

Lines changed: 0 additions & 51 deletions
This file was deleted.

cmake/modules/RootBuildOptions.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@ if(all)
230230
set(fcgi_defvalue ON)
231231
set(imt_defvalue ON)
232232
set(mathmore_defvalue ON)
233-
set(monalisa_defvalue ON)
234233
set(mysql_defvalue ON)
235234
set(odbc_defvalue ON)
236235
set(opengl_defvalue ON)

cmake/modules/RootConfiguration.cmake

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -268,11 +268,6 @@ set(xrdversion)
268268
set(alloclib)
269269
set(alloclibdir)
270270

271-
set(buildmonalisa ${value${monalisa}})
272-
set(monalisalibdir ${MONALISA_LIBRARY_DIR})
273-
set(monalisalib ${MONALISA_LIBRARY})
274-
set(monalisaincdir ${MONALISA_INCLUDE_DIR})
275-
276271
set(ssllib ${OPENSSL_LIBRARIES})
277272
set(ssllibdir)
278273
set(sslincdir ${OPENSSL_INCLUDE_DIR})

cmake/modules/SearchInstalledSoftware.cmake

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -904,20 +904,6 @@ if(shadowpw)
904904
endif()
905905
endif()
906906

907-
#---Monalisa support----------------------------------------------------------------
908-
if(monalisa)
909-
if(fail-on-missing)
910-
find_package(Monalisa REQUIRED)
911-
else()
912-
find_package(Monalisa)
913-
if(NOT MONALISA_FOUND)
914-
message(STATUS "Monalisa not found. Set variable MONALISA_DIR to point to your Monalisa installation")
915-
message(STATUS "For the time being switching OFF 'monalisa' option")
916-
set(monalisa OFF CACHE BOOL "Disabled because Monalisa not found (${monalisa_description})" FORCE)
917-
endif()
918-
endif()
919-
endif()
920-
921907
#---Check for Xrootd support---------------------------------------------------------
922908

923909
foreach(suffix FOUND INCLUDE_DIR INCLUDE_DIRS LIBRARY LIBRARIES)

config/Makefile.in

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -260,11 +260,6 @@ BUILDXRDCLT := @buildxrdclt@
260260
ALLOCLIB := @alloclib@
261261
ALLOCLIBDIR := @alloclibdir@
262262

263-
BUILDMONALISA := @buildmonalisa@
264-
MONALISALIBDIR := @monalisalibdir@
265-
MONALISACLILIB := @monalisalib@
266-
MONALISAINCDIR := $(filter-out /usr/include, @monalisaincdir@)
267-
268263
BUILDTBB := @buildtbb@
269264
TBBLIBDIR := @tbblibdir@
270265
TBBLIB := @tbblib@

documentation/doxygen/makeinput.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ echo " ../../net/doc/ \\" >> Doxyfile_INPUT
5959
echo " ../../net/auth/ \\" >> Doxyfile_INPUT
6060
echo " ../../net/davix/ \\" >> Doxyfile_INPUT
6161
echo " ../../net/http/ \\" >> Doxyfile_INPUT
62-
echo " ../../net/monalisa/ \\" >> Doxyfile_INPUT
6362
echo " ../../net/net/ \\" >> Doxyfile_INPUT
6463
echo " ../../net/netxng/ \\" >> Doxyfile_INPUT
6564
echo " ../../net/httpsniff/ \\" >> Doxyfile_INPUT

etc/plugins/TVirtualMonitoringWriter/P010_TMonaLisaWriter.C

Lines changed: 0 additions & 5 deletions
This file was deleted.

net/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ if(NOT WIN32 AND ssl)
1111
add_subdirectory(rpdutils)
1212
endif()
1313

14-
if(monalisa)
15-
add_subdirectory(monalisa)
16-
endif()
17-
1814
if(davix)
1915
add_subdirectory(davix)
2016
endif()

0 commit comments

Comments
 (0)