Add a simple CMake script to build and install everything

The script was adapted from the one included in Delphes.

Signed-off-by: JP-Ellis <josh@jpellis.me>

4 files changed, 43 insertions, 110 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6c10b8c40596..f2b206a5cc2c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,19 @@
 # Generated by mksrcinfo v8
-# Tue Feb 14 02:51:03 UTC 2017
+# Tue Feb 14 12:54:27 UTC 2017
 pkgbase = exrootanalysis
 	pkgdesc = A package designed to simplify ROOT tree production and analysis.
 	pkgver = 0.0.23
-	pkgrel = 1
+	pkgrel = 2
 	url = https://cp3.irmp.ucl.ac.be/projects/ExRootAnalysis
 	arch = i686
 	arch = x86_64
 	license = GPL3
+	makedepends = cmake
 	depends = root
 	source = exrootanalysis-r23.zip::https://cp3.irmp.ucl.ac.be/projects/ExRootAnalysis/changeset/23/trunk?old_path=%2F&format=zip
-	source = fix.patch
+	source = CMakeLists.txt
 	sha256sums = b30897ae035b741fa93f47e7cd5adc5f942d77498c143ef17ef4f1377207086e
-	sha256sums = 6147bc6c3018ff8c80f3ba60f75e210921e3f714fb35d83c40f47b0401df821c
+	sha256sums = 6b222226a869c0350e14dce754ebcddf43aa6403f4304104a6e720932b805385
 
 pkgname = exrootanalysis
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 000000000000..b3d91cc53d68
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,31 @@
+cmake_minimum_required(VERSION 2.8)
+
+project(ExRootAnalysis)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+
+find_package(ROOT)
+include(${ROOT_USE_FILE})
+
+file(GLOB sources src/*.cc)
+file(GLOB headers ExRootAnalysis/*.h)
+
+if(${ROOT_VERSION} LESS 6.0)
+  ROOT_GENERATE_DICTIONARY(ExRootAnalysisDict ${headers} LINKDEF src/ExRootAnalysisLinkDef.h)
+else()
+  ROOT_GENERATE_DICTIONARY(ExRootAnalysisDict MODULE ExRootAnalysisDict ${headers} LINKDEF src/ExRootAnalysisLinkDef.h)
+endif()
+
+include_directories(${ROOT_INCLUDE_DIR} .)
+
+add_library(ExRootAnalysis SHARED ${sources} ExRootAnalysisDict.cxx)
+install(FILES ${headers} DESTINATION include/ExRootAnalaysis)
+install(TARGETS ExRootAnalysis
+  LIBRARY DESTINATION lib)
+
+if (${ROOT_VERSION} GREATER 6)
+  install(FILES
+      ${PROJECT_BINARY_DIR}/libExRootAnalysisDict_rdict.pcm
+      DESTINATION lib)
+endif()
diff --git a/PKGBUILD b/PKGBUILD
index 1af079ba0b7a..61720c2b3f4f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,31 +2,29 @@
 
 pkgname=exrootanalysis
 pkgver=0.0.23
-pkgrel=1
+pkgrel=2
 pkgdesc="A package designed to simplify ROOT tree production and analysis."
 url="https://cp3.irmp.ucl.ac.be/projects/ExRootAnalysis"
 arch=('i686' 'x86_64')
 license=('GPL3')
 depends=('root')
+makedepends=('cmake')
 source=("${pkgname}-r${pkgver##*.}.zip::https://cp3.irmp.ucl.ac.be/projects/ExRootAnalysis/changeset/${pkgver##*.}/trunk?old_path=%2F&format=zip"
-        "fix.patch")
+        "CMakeLists.txt")
 sha256sums=('b30897ae035b741fa93f47e7cd5adc5f942d77498c143ef17ef4f1377207086e'
-            '6147bc6c3018ff8c80f3ba60f75e210921e3f714fb35d83c40f47b0401df821c')
+            '6b222226a869c0350e14dce754ebcddf43aa6403f4304104a6e720932b805385')
 
 prepare() {
-    patch -p 1 < fix.patch
+    cp CMakeLists.txt trunk
 }
 
 build() {
-    cd "trunk"
+    cmake trunk -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
     make
 }
 
 package() {
-    mkdir -p "${pkgdir}/usr/include"
-    cp -r "${srcdir}/trunk/ExRootAnalysis" "${pkgdir}/usr/include"
-    cp -r "${srcdir}/trunk/lib" "${pkgdir}/usr/"
-    cp "${srcdir}/trunk/tmp/src/ExRootAnalysisDict_rdict.pcm" "${pkgdir}/usr/lib/libExRootAnalysisDict_rdict.pcm"
+    make install
 }
 
 # Local Variables:
diff --git a/fix.patch b/fix.patch
deleted file mode 100644
index 0d39aac3ed99..000000000000
--- a/fix.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff --git a/trunk/test/ExRootLHCOlympicsConverter.cpp b/trunk/test/ExRootLHCOlympicsConverter.cpp
-index cb6ee65..c3ddf92 100644
---- a/trunk/test/ExRootLHCOlympicsConverter.cpp
-+++ b/trunk/test/ExRootLHCOlympicsConverter.cpp
-@@ -159,7 +159,7 @@ Long64_t LHCOlympicsConverter::GetNumberOfObjects(ifstream &inputFileStream)
-       fBufferStream.clear();

-       fBufferStream.str(fBuffer);

-       

--      canReadNumber = (fBufferStream >> number);

-+      canReadNumber = static_cast<bool>(fBufferStream >> number);

-     }

-     while(!canReadNumber);

- 

-@@ -193,19 +193,19 @@ Bool_t LHCOlympicsConverter::ReadObject(ifstream &inputFileStream)
- 

-     for(i = 0; canReadNumber && i < LHCOlympicsObject::maxIntParam; ++i)

-     {

--      canReadNumber = (fBufferStream >> fCurrentObject.intParam[i]);

-+      canReadNumber = static_cast<bool>(fBufferStream >> fCurrentObject.intParam[i]);

-     }

-     

-     if(canReadNumber && fCurrentObject.intParam[0] == 0)

-     {

-       fEventNumber = fCurrentObject.intParam[1];

--      canReadNumber = (fBufferStream >> fTriggerWord);

-+      canReadNumber = static_cast<bool>(fBufferStream >> fTriggerWord);

-     }

-     else

-     {

-       for(i = 0; canReadNumber && i < LHCOlympicsObject::maxDblParam; ++i)

-       {

--        canReadNumber = (fBufferStream >> fCurrentObject.dblParam[i]);

-+        canReadNumber = static_cast<bool>(fBufferStream >> fCurrentObject.dblParam[i]);

-       }

-     }

-   }

-diff --git a/trunk/test/LHEF.h b/trunk/test/LHEF.h
-index f58c764..e917629 100644
---- a/trunk/test/LHEF.h
-+++ b/trunk/test/LHEF.h
-@@ -534,7 +534,7 @@ protected:
-    * Used internally to read a single line from the stream.
-    */
-   bool getline() {
--    return ( std::getline(file, currentLine) );
-+    return static_cast<bool>( std::getline(file, currentLine) );
-   }
- 
- protected:
-diff --git a/trunk/test/MatchingSTDHEPConverter.cpp b/trunk/test/MatchingSTDHEPConverter.cpp
-index 06e9701..8a7d49d 100644
---- a/trunk/test/MatchingSTDHEPConverter.cpp
-+++ b/trunk/test/MatchingSTDHEPConverter.cpp
-@@ -129,7 +129,7 @@ int main(int argc, char *argv[])
- 
-   ofstream outputTextFile(argv[3], ios::out);
- 
--  if(outputTextFile == 0)
-+  if(! outputTextFile)
-   {
-     cerr << "** ERROR: Can't open '" << argv[3] << "' for ouput" << endl;
-     return 1;
-diff --git a/trunk/test/MatchingTreeConverter.cpp b/trunk/test/MatchingTreeConverter.cpp
-index 0cf7c90..af52316 100644
---- a/trunk/test/MatchingTreeConverter.cpp
-+++ b/trunk/test/MatchingTreeConverter.cpp
-@@ -110,7 +110,7 @@ Long64_t MatchingTreeConverter::GetNumberOfObjects(ifstream &inputFileStream)
-       fBufferStream.clear();

-       fBufferStream.str(fBuffer);

-       

--      canReadNumber = (fBufferStream >> number);

-+      canReadNumber = static_cast<bool>(fBufferStream >> number);

-     }

-     while(!canReadNumber);

- 

-@@ -144,7 +144,7 @@ Bool_t MatchingTreeConverter::ReadObject(ifstream &inputFileStream)
- 

-     for(i = 0; canReadNumber && i < MatchingTreeObject::maxDblParam; ++i)

-     {

--      canReadNumber = (fBufferStream >> fCurrentObject.dblParam[i]);

-+      canReadNumber = static_cast<bool>(fBufferStream >> fCurrentObject.dblParam[i]);

-     }

-   }

-   while(!canReadNumber);

-diff --git a/trunk/Makefile.orig b/trunk/Makefile
-index d836fe4..43c7fb4 100644
---- a/trunk/Makefile
-+++ b/trunk/Makefile
-@@ -7,7 +7,7 @@
- # multi-platform configuration is taken from ROOT (root/test/Makefile.arch)
- #
- 
--include $(ROOTSYS)/test/Makefile.arch
-+include /etc/Makefile.arch
- 
- ifeq ($(ARCH),macosx64)
- UNDEFOPT = dynamic_lookup