diff --git a/FindLog4Cpp.cmake b/FindLog4Cpp.cmake deleted file mode 100644 index 00c867c1..00000000 --- a/FindLog4Cpp.cmake +++ /dev/null @@ -1,24 +0,0 @@ -# - Try to find Log4Cpp -# Once done this will define -# Log4Cpp_FOUND - System has Log4Cpp -# Log4Cpp_INCLUDE_DIRS - The Log4Cpp include directories -# Log4Cpp_LIBRARIES - The libraries needed to use Log4Cpp -# Log4Cpp_DEFINITIONS - Compiler switches required for using Log4Cpp - -find_package(PkgConfig) -pkg_check_modules(PC_Log4Cpp QUIET log4cpp) -set(Log4Cpp_DEFINITIONS ${PC_Log4Cpp_CFLAGS_OTHER}) - -find_path(Log4Cpp_INCLUDE_DIR "log4cpp/Category.hh" HINTS ${PC_Log4Cpp_INCLUDE_DIRS}) -find_library(Log4Cpp_LIBRARY NAMES log4cpp log4cppD HINTS ${PC_Log4Cpp_LIBRARY_DIRS} ) - -set(Log4Cpp_LIBRARIES ${Log4Cpp_LIBRARY} ) -set(Log4Cpp_INCLUDE_DIRS ${Log4Cpp_INCLUDE_DIR} ) - -include(FindPackageHandleStandardArgs) -# handle the QUIETLY and REQUIRED arguments and set Log4Cpp_FOUND to TRUE -# if all listed variables are TRUE -find_package_handle_standard_args( - Log4Cpp DEFAULT_MSG Log4Cpp_LIBRARY Log4Cpp_INCLUDE_DIR) - -mark_as_advanced(Log4Cpp_INCLUDE_DIR Log4Cpp_LIBRARY) diff --git a/documentation/installation/linux.rst b/documentation/installation/linux.rst index 1482449a..e6c24f36 100644 --- a/documentation/installation/linux.rst +++ b/documentation/installation/linux.rst @@ -16,9 +16,9 @@ For Debian and Ubuntu, the following package list will allow you to compile the sudo apt-get install \ build-essential cmake pkg-config python-minimal \ - libboost-dev libboost-date-time-dev libboost-filesystem-dev \ + libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-log-dev \ libdcmtk2-dev libicu-dev libjsoncpp-dev zlib1g-dev \ - libboost-python-dev python-dev \ + pybind11-dev python-dev \ dcmtk libboost-test-dev python-nose Build Odil @@ -56,9 +56,7 @@ Choose the Python version If you have multiple versions of Python installed, you may need to specify the following extra parameters to CMake to build the Python wrappers for a specific version: -- ``Python_ADDITIONAL_VERSIONS``: the requested Python version number, e.g. ``2.7`` or ``3.6`` - ``PYTHON_EXECUTABLE``: path to the Python interpreter, e.g. ``/usr/bin/python2.7`` or ``/usr/bin/python3.6`` -- ``Boost_PYTHON_LIBRARY_DEBUG`` and ``Boost_PYTHON_LIBRARY_RELEASE``: the path to the Boost.Python library, e.g. ``/usr/lib/x86_64-linux-gnu/libboost_python-py27.so``. Install Odil ------------ diff --git a/documentation/installation/mac.rst b/documentation/installation/mac.rst index aa8942b6..482f7433 100644 --- a/documentation/installation/mac.rst +++ b/documentation/installation/mac.rst @@ -21,7 +21,7 @@ The following package list will allow you to compile the whole library: brew install \ cmake pkg-config \ - boost boost-python dcmtk icu4c jsoncpp python + boost dcmtk icu4c jsoncpp pybind11 python pip install nose Build Odil