Remove libxml and dependencies from build files ref #20

Argonne-National-Laboratory · Mar 15, 2019 · 71f635c · 71f635c
1 parent 328a70a
commit 71f635c
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 184 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 sudo: enabled
 before_install:
-      - sudo apt-get install -y build-essential cmake libxml++2.6-dev libboost-dev libblas-dev liblapack-dev python-dev python-networkx python-numpy python-scipy python-matplotlib python-nose
+      - sudo apt-get install -y build-essential cmake libboost-dev libblas-dev liblapack-dev python-dev python-networkx python-numpy python-scipy python-matplotlib python-nose
 install:
       - cmake -D WRAP_PYTHON=ON .
       - make

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -37,9 +37,8 @@ INCLUDE_DIRECTORIES(SYSTEM ${Boost_INCLUDE_DIRS})
 set(BLAS_VENDOR Generic)
 FIND_PACKAGE(BLAS REQUIRED)
 FIND_PACKAGE(LAPACK REQUIRED)
-FIND_PACKAGE(libxml++ REQUIRED)
-INCLUDE_DIRECTORIES(SYSTEM ${libxml++_INCLUDE_DIRS})
 
+INCLUDE_DIRECTORIES(SYSTEM rapidxml)
 
 ### PLATFORM AND COMPILER SPECIFIC OPTIONS ###
 # Make better debug on Intel

diff --git a/INSTALL.md b/INSTALL.md
@@ -12,15 +12,15 @@ These instructions assuming you are building in the source directory.
 To compile just the base library:
 
 ```
-apt-get install build-essential cmake libxml++2.6-dev libboost-dev libblas-dev liblapack-dev
+apt-get install build-essential cmake libboost-dev libblas-dev liblapack-dev
 cmake .
 make
 ```
 
 To compile both the base library and the python bindings:
 
 ```
-apt-get install build-essential cmake libxml++2.6-dev libboost-dev libblas-dev liblapack-dev python-dev python-networkx python-numpy python-scipy python-matplotlib python-nose
+apt-get install build-essential cmake libboost-dev libblas-dev liblapack-dev python-dev python-networkx python-numpy python-scipy python-matplotlib python-nose
 cmake -D WRAP_PYTHON=ON .
 make
 ```
@@ -36,7 +36,7 @@ nosetests
 For just the base library setup prerequisites
 
 ```
-brew install libxml++ boost cmake
+brew install boost cmake
 ```
 
 and then build the library
@@ -49,7 +49,7 @@ make
 For the library and the python bindings setup prerequisites
 
 ```
-brew install libxml++ boost cmake python@2
+brew install boost cmake python@2
 pip install nose numpy scipy nose matplotlib networkx
 ```
 
@@ -58,9 +58,3 @@ and then build the library
 cmake -D WRAP_PYTHON=ON .
 make 
 ```
-
-Users have reported that if you use libxml++3 you may need to manually request 
-libxml2 as well and add the libxml2 pkgconfig path to the environment:
-```
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/opt/libxml2/lib/pkgconfig
-```
diff --git a/cmake/Modules/Findglib.cmake b/cmake/Modules/Findglib.cmake
diff --git a/cmake/Modules/Findglibmm.cmake b/cmake/Modules/Findglibmm.cmake
diff --git a/cmake/Modules/Findlibxml++.cmake b/cmake/Modules/Findlibxml++.cmake
diff --git a/cmake/Modules/Findsigc++.cmake b/cmake/Modules/Findsigc++.cmake
diff --git a/doc/sphinx/started.rst b/doc/sphinx/started.rst
@@ -5,13 +5,7 @@ Installing NEML
 ---------------
 
 Compiling NEML requires the NEML source, a C++ compiler, 
-the `Boost <https://www.boost.org/>`_ library,
-and `libxml++ <http://libxmlplusplus.sourceforge.net/>`_,
-which in turn requires 
-`glib <https://developer.gnome.org/glib/>`_, 
-`glibmm <https://github.com/GNOME/glibmm>`_, 
-`sigc++ <https://developer.gnome.org/libsigc++/stable/>`_,
-and `libxml2 <http://xmlsoft.org/>`_.
+and the `Boost <https://www.boost.org/>`_ library.
 Additionally, you will need `BLAS <http://www.netlib.org/blas/>`_ and 
 `LAPACK <http://www.netlib.org/lapack/>`_.
 
@@ -53,7 +47,7 @@ First install the prerequisites
 
 .. code-block:: console
 
-   apt-get install build-essential git cmake libxml++2.6-dev libboost-dev libblas-dev liblapack-dev 
+   apt-get install build-essential git cmake libboost-dev libblas-dev liblapack-dev 
 
 Clone the neml source code