From c36bcd9d488a13abaee85fe66fd2d0b2017acd48 Mon Sep 17 00:00:00 2001
From: Mikhail Iliushin <miliushi@lxplus0088.cern.ch>
Date: Thu, 27 Aug 2015 13:49:26 +0200
Subject: [PATCH] Revert "making doxygen xapian dependent"
This reverts commit e991ac7dff15ec5462cca9b1aff686463e8ec23d.
---
cmake/toolchain/heptools-dev2.cmake | 1 -
cmake/toolchain/heptools-dev3.cmake | 1 -
cmake/toolchain/heptools-dev4.cmake | 1 -
cmake/toolchain/heptools-experimental.cmake | 4 ++--
externals/CMakeLists.txt | 9 ++++-----
5 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/cmake/toolchain/heptools-dev2.cmake b/cmake/toolchain/heptools-dev2.cmake
index efcd530d68..8a8403b029 100644
--- a/cmake/toolchain/heptools-dev2.cmake
+++ b/cmake/toolchain/heptools-dev2.cmake
@@ -127,7 +127,6 @@ if(NOT ${LCG_OS}${LCG_OSVERS} STREQUAL mac109 AND NOT LCG_TARGET MATCHES "icc" )
endif()
LCG_external_package(vectorclass 1.16 )
LCG_external_package(vdt 0.3.6 )
-LCG_external_package(xapian 1.2.21 )
LCG_external_package(XercesC 3.1.1p1 author=3.1.1 )
LCG_external_package(xqilla 2.2.4p1 )
LCG_external_package(xrootd 4.2.2 )
diff --git a/cmake/toolchain/heptools-dev3.cmake b/cmake/toolchain/heptools-dev3.cmake
index 222a191f74..7607b40f2a 100644
--- a/cmake/toolchain/heptools-dev3.cmake
+++ b/cmake/toolchain/heptools-dev3.cmake
@@ -129,7 +129,6 @@ if(NOT ${LCG_OS}${LCG_OSVERS} STREQUAL mac109 AND NOT LCG_TARGET MATCHES "icc" )
endif()
LCG_external_package(vectorclass 1.16 )
LCG_external_package(vdt 0.3.6 )
-LCG_external_package(xapian 1.2.21 )
LCG_external_package(XercesC 3.1.1p1 author=3.1.1 )
LCG_external_package(xqilla 2.2.4p1 )
LCG_external_package(xrootd 4.2.2 )
diff --git a/cmake/toolchain/heptools-dev4.cmake b/cmake/toolchain/heptools-dev4.cmake
index f1b7f496f9..0c946930f5 100644
--- a/cmake/toolchain/heptools-dev4.cmake
+++ b/cmake/toolchain/heptools-dev4.cmake
@@ -129,7 +129,6 @@ if(NOT ${LCG_OS}${LCG_OSVERS} STREQUAL mac109 AND NOT LCG_TARGET MATCHES "icc" )
endif()
LCG_external_package(vectorclass 1.16 )
LCG_external_package(vdt 0.3.6 )
-LCG_external_package(xapian 1.2.21 )
LCG_external_package(XercesC 3.1.1p1 author=3.1.1 )
LCG_external_package(xqilla 2.2.4p1 )
LCG_external_package(xrootd 4.2.2 )
diff --git a/cmake/toolchain/heptools-experimental.cmake b/cmake/toolchain/heptools-experimental.cmake
index aef5499382..7de86dd8d2 100644
--- a/cmake/toolchain/heptools-experimental.cmake
+++ b/cmake/toolchain/heptools-experimental.cmake
@@ -40,7 +40,7 @@ LCG_external_package(cx_oracle 5.1.1
if(NOT ${LCG_OS} STREQUAL mac)
LCG_external_package(Davix 0.4.0 )
endif()
-LCG_external_package(doxygen 1.8.9.1 )
+LCG_external_package(doxygen 1.8.9.1.p1 )
LCG_external_package(expat 2.0.1 )
LCG_external_package(eigen 3.2.4 )
LCG_external_package(fastjet 3.1.1 )
@@ -308,4 +308,4 @@ LCG_external_package(looptools 2.8 ${MCGENPATH}/looptools)
# Prepare the search paths according to the versions above
-LCG_prepare_paths()
\ No newline at end of file
+LCG_prepare_paths()
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index cda4abcd1e..8f9810d7b6 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -28,8 +28,7 @@ LCGPackage_Add(
URL http://service-spi.web.cern.ch/service-spi/external/tarFiles/xapian-core-${xapian_native_version}.tar.gz
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR>
BUILD_COMMAND make
- INSTALL_COMMAND make install
- COMMAND ${CMAKE_COMMAND} -E copy <INSTALL_DIR>/include/xapian.h <INSTALL_DIR>/include/xapian/.
+ INSTALL_COMMAND make install
BUILD_IN_SOURCE 1
)
#---png-----------------------------------------------------------------------------------------------
@@ -670,11 +669,11 @@ LCGPackage_Add(
)
#---doxygen----------------------------------------------------------------------------------------------
LCGPackage_Add(
- doxygen
+ doxygen
URL http://service-spi.web.cern.ch/service-spi/external/tarFiles/doxygen-${doxygen_native_version}.src.tar.gz
- CONFIGURE_COMMAND env XAPIAN=${xapian_home} ./configure --dot ${graphviz_home}/bin/dot --with-doxysearch --prefix <INSTALL_DIR>
+ CONFIGURE_COMMAND ./configure --dot ${graphviz_home}/bin/dot --prefix <INSTALL_DIR>
BUILD_IN_SOURCE 1
- DEPENDS graphviz xapian
+ DEPENDS graphviz
)
#---expat------------------------------------------------------------------------------------------------
--
GitLab