From 5fe181b5ce737856171c306864270b269c7327a1 Mon Sep 17 00:00:00 2001
From: Gabriel Studer <gabriel.studer@unibas.ch>
Date: Sun, 8 Nov 2020 21:06:46 +0100
Subject: [PATCH] Detect Boost and Python using functionality provided by CMake
instead of our own code.
You might have to adapt CMake flags when building OpenStructure to variables specified here:
https://cmake.org/cmake/help/latest/module/FindPython.html
---
.gitlab-ci.yml | 2 +-
CHANGELOG.txt | 4 +
CMakeLists.txt | 13 +-
build_configs/buildconfig_bc2 | 2 +-
build_configs/buildconfig_bc2_static | 2 +-
build_configs/darwin_macports.txt | 2 +-
build_configs/win32 | 2 +-
cmake_support/FindBoost.cmake | 1211 -------------------------
cmake_support/FindNumpy.cmake | 6 +-
cmake_support/FindOPENSTRUCTURE.cmake | 4 +-
cmake_support/FindPython.cmake | 184 ----
cmake_support/OST.cmake | 42 +-
deployment/linux/CMakeLists.txt | 2 +-
deployment/macos/CMakeLists.txt | 6 +-
modules/base/pymod/CMakeLists.txt | 2 +-
modules/doc/install.rst | 25 +-
modules/gui/src/CMakeLists.txt | 4 +-
scripts/CMakeLists.txt | 9 +-
scripts/ost-nightly-build.sh | 2 +-
scripts/ost.in | 4 +-
scripts/ost_config.in | 4 +-
21 files changed, 71 insertions(+), 1461 deletions(-)
delete mode 100644 cmake_support/FindBoost.cmake
delete mode 100644 cmake_support/FindPython.cmake
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 083985456..01c5c5f6c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,7 +55,7 @@ test:centos7.3:
-DENABLE_GUI=OFF
-DUSE_NUMPY=1
-DUSE_RPATH=1
- -DPYTHON_ROOT=$EBROOTPYTHON
+ -DPython_ROOT_DIR=$EBROOTPYTHON
-DEIGEN3_INCLUDE_DIR=$EBROOTEIGEN/include
-DFFTW_LIBRARY=$EBROOTFFTW/lib/libfftw3f.a
-DFFTW_INCLUDE_DIR=$EBROOTFFTW/include
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index aa57bd783..6d7accf18 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,10 @@ Changes in Release 2.x.x
* Introduced CreateMeanlDDTHA function to evaluate the consistency of a
structure with a full ensemble of structures.
* FindMembrane algorithm returns additional intermediate results.
+ * Detect Boost and Python using functionality provided by CMake instead of our
+ own code. You might have to adapt CMake flags when building OpenStructure to
+ variables specified here:
+ https://cmake.org/cmake/help/latest/module/FindPython.html
* Several minor bug fixes and improvements.
Changes in Release 2.1.0
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6bd006d78..11f397e29 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -187,11 +187,14 @@ if (ENABLE_STATIC AND UNIX AND NOT APPLE)
endif()
# Python needed before Boost
-find_package(Python 3.6 REQUIRED)
+find_package(Python 3.6 REQUIRED COMPONENTS Interpreter Development)
# Split version string
-string(REPLACE "." ";" _python_version_list ${PYTHON_VERSION})
-list(GET _python_version_list 0 PYTHON_VERSION_MAJOR)
-list(GET _python_version_list 1 PYTHON_VERSION_MINOR)
+string(REPLACE "." ";" _python_version_list ${Python_VERSION})
+list(GET _python_version_list 0 Python_VERSION_MAJOR)
+list(GET _python_version_list 1 Python_VERSION_MINOR)
+# where Python modules live
+set(PYTHON_MODULE_PATH "python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages/")
+
if(BOOST_VERSION)
message(STATUS "forcing boost to version ${BOOST_VERSION}")
@@ -356,7 +359,7 @@ set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
"${FILES_TO_BE_REMOVED}")
-#ost_match_boost_python_version(${PYTHON_LIBRARIES})
+#ost_match_boost_python_version(${Python_LIBRARIES})
if (CMAKE_COMPILER_IS_GNUCXX)
set(HIDDEN_VIS_MSG
diff --git a/build_configs/buildconfig_bc2 b/build_configs/buildconfig_bc2
index 5c8dccf19..ba34013b3 100644
--- a/build_configs/buildconfig_bc2
+++ b/build_configs/buildconfig_bc2
@@ -1,6 +1,6 @@
set(FFTW_INCLUDE_PATH "/scicore/soft/apps/FFTW/3.3.8-gompi-2018b/include/" CACHE PATH "")
set(FFTW_LIBRARY "/scicore/soft/apps/FFTW/3.3.8-gompi-2018b/lib/libfftw3f.a" CACHE PATH "")
-set(PYTHON_ROOT "/scicore/soft/apps/Python/3.6.6-foss-2018" CACHE PATH "")
+set(Python_ROOT_DIR "/scicore/soft/apps/Python/3.6.6-foss-2018" CACHE PATH "")
set(EIGEN3_INCLUDE_DIR "/scicore/soft/apps/Eigen/3.3.1/include/Eigen" CACHE PATH "")
set(BOOST_ROOT "/scicore/soft/apps/Boost/1.68.0-foss-2018b-Python-3.6.6" CACHE PATH "")
set(QT_QMAKE_EXECUTABLE "/usr/bin/qmake-qt5" CACHE PATH "")
diff --git a/build_configs/buildconfig_bc2_static b/build_configs/buildconfig_bc2_static
index bf27f7e8f..824330ea2 100644
--- a/build_configs/buildconfig_bc2_static
+++ b/build_configs/buildconfig_bc2_static
@@ -3,7 +3,7 @@ set(FFTW_LIBRARY "/scicore/soft/apps/FFTW/3.3.8-gompi-2018b/lib/libfftw3f.a" CA
set(DL_LIBRARIES "/usr/lib64/libdl.a" CACHE PATH "")
set(PTHREAD_LIBRARIES "/usr/lib64/libpthread.a" CACHE PATH "")
set(ZLIB_LIBRARY "/scicore/soft/apps/zlib/1.2.11-GCCcore-7.3.0/lib/libz.a" CACHE PATH "")
-set(PYTHON_ROOT "/scicore/soft/apps/Python/3.6.6-foss-2018" CACHE PATH "")
+set(Python_ROOT_DIR "/scicore/soft/apps/Python/3.6.6-foss-2018" CACHE PATH "")
set(EIGEN3_INCLUDE_DIR "/scicore/soft/apps/Eigen/3.3.1/include/Eigen" CACHE PATH "")
set(QT_QMAKE_EXECUTABLE "/usr/bin/qmake-qt5" CACHE PATH "")
set(COMPOUND_LIB "/scicore/home/schwede/GROUP/OpenStructure/ChemLib/1.8/compounds.chemlib" CACHE PATH "")
diff --git a/build_configs/darwin_macports.txt b/build_configs/darwin_macports.txt
index 5d5aefe2d..54834cccd 100644
--- a/build_configs/darwin_macports.txt
+++ b/build_configs/darwin_macports.txt
@@ -1,7 +1,7 @@
# this file contains a list of settings to be used on macOS with
# the dependencies installed over MacPorts
set(BOOST_ROOT "/opt/local" CACHE PATH "prefix for the boost")
-set(PYTHON_ROOT "/opt/local" CACHE PATH "prefix for python")
+set(Python_ROOT_DIR "/opt/local" CACHE PATH "prefix for python")
set(QT_QMAKE_EXECUTABLE "/opt/local/bin/qmake" CACHE PATH
"absolute path to qt executable")
set(CMAKE_Fortran_FLAGS "-freal-loops" CACHE STRING "fortran compiler flags")
diff --git a/build_configs/win32 b/build_configs/win32
index 7fac30a64..114baf2fc 100644
--- a/build_configs/win32
+++ b/build_configs/win32
@@ -4,7 +4,7 @@
set(CMAKE_GENERATOR "Visual Studio 9 2008" CACHE PATH "generator")
set(USER_DIR "d:/programs")
set(BOOST_ROOT "${USER_DIR}/" CACHE PATH "prefix for boost")
-set(PYTHON_ROOT "${USER_DIR}" CACHE PATH "points to python installation")
+set(Python_ROOT_DIR "${USER_DIR}" CACHE PATH "points to python installation")
set(PNG_PNG_INCLUDE_DIR "${USER_DIR}/include" CACHE PATH "includes for libpng")
set(PNG_LIBRARY "${USER_DIR}/lib/libpng13.lib" CACHE PATH "includes for libpng")
set(ZLIB_INCLUDE_DIR "${USER_DIR}/include/" CACHE PATH "zlib includes")
diff --git a/cmake_support/FindBoost.cmake b/cmake_support/FindBoost.cmake
deleted file mode 100644
index ad6b1598d..000000000
--- a/cmake_support/FindBoost.cmake
+++ /dev/null
@@ -1,1211 +0,0 @@
-# - Try to find Boost include dirs and libraries
-# Usage of this module as follows:
-#
-# NOTE: Take note of the Boost_ADDITIONAL_VERSIONS variable below.
-# Due to Boost naming conventions and limitations in CMake this find
-# module is NOT future safe with respect to Boost version numbers,
-# and may break.
-#
-# == Using Header-Only libraries from within Boost: ==
-#
-# find_package( Boost 1.36.0 )
-# if(Boost_FOUND)
-# include_directories(${Boost_INCLUDE_DIRS})
-# add_executable(foo foo.cc)
-# endif()
-#
-#
-# == Using actual libraries from within Boost: ==
-#
-# set(Boost_USE_STATIC_LIBS ON)
-# set(Boost_USE_MULTITHREADED ON)
-# set(Boost_USE_STATIC_RUNTIME OFF)
-# find_package( Boost 1.36.0 COMPONENTS date_time filesystem system ... )
-#
-# if(Boost_FOUND)
-# include_directories(${Boost_INCLUDE_DIRS})
-# add_executable(foo foo.cc)
-# target_link_libraries(foo ${Boost_LIBRARIES})
-# endif()
-#
-#
-# The components list needs to contain actual names of boost libraries only,
-# such as "date_time" for "libboost_date_time". If you're using parts of
-# Boost that contain header files only (e.g. foreach) you do not need to
-# specify COMPONENTS.
-#
-# You should provide a minimum version number that should be used. If you provide this
-# version number and specify the REQUIRED attribute, this module will fail if it
-# can't find the specified or a later version. If you specify a version number this is
-# automatically put into the considered list of version numbers and thus doesn't need
-# to be specified in the Boost_ADDITIONAL_VERSIONS variable (see below).
-#
-# NOTE for Visual Studio Users:
-# Automatic linking is used on MSVC & Borland compilers by default when
-# #including things in Boost. It's important to note that setting
-# Boost_USE_STATIC_LIBS to OFF is NOT enough to get you dynamic linking,
-# should you need this feature. Automatic linking typically uses static
-# libraries with a few exceptions (Boost.Python is one).
-#
-# Please see the section below near Boost_LIB_DIAGNOSTIC_DEFINITIONS for
-# more details. Adding a TARGET_LINK_LIBRARIES() as shown in the example
-# above appears to cause VS to link dynamically if Boost_USE_STATIC_LIBS
-# gets set to OFF. It is suggested you avoid automatic linking since it
-# will make your application less portable.
-#
-# =========== The mess that is Boost_ADDITIONAL_VERSIONS (sorry?) ============
-#
-# OK, so the Boost_ADDITIONAL_VERSIONS variable can be used to specify a list of
-# boost version numbers that should be taken into account when searching
-# for Boost. Unfortunately boost puts the version number into the
-# actual filename for the libraries, so this variable will certainly be needed
-# in the future when new Boost versions are released.
-#
-# Currently this module searches for the following version numbers:
-# 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1,
-# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0, 1.39, 1.39.0,
-# 1.40, 1.40.0, 1.41, 1.41.0, 1.42, 1.42.0, 1.43, 1.43.0, 1.44, 1.44.0,
-# 1.45, 1.45.0, 1.46, 1.46.0, 1.46.1, 1.47, 1.47.0, 1.48, 1.48.0,
-# 1.49, 1.49.0, 1.50, 1.50.0, 1.51, 1.51.0, 1.52, 1.52.0,
-# 1.53, 1.53.0, 1.54, 1.54.0, 1.55, 1.55.0, 1.56, 1.56.0
-#
-# NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should
-# add both 1.x and 1.x.0 as shown above. Official Boost include directories
-# omit the 3rd version number from include paths if it is 0 although not all
-# binary Boost releases do so.
-#
-# set(Boost_ADDITIONAL_VERSIONS "1.78" "1.78.0" "1.79" "1.79.0")
-#
-# ===================================== ============= ========================
-#
-# Variables used by this module, they can change the default behaviour and
-# need to be set before calling find_package:
-#
-# Boost_USE_MULTITHREADED Can be set to OFF to use the non-multithreaded
-# boost libraries. If not specified, defaults
-# to ON.
-#
-# Boost_USE_STATIC_LIBS Can be set to ON to force the use of the static
-# boost libraries. Defaults to OFF.
-#
-# Boost_NO_SYSTEM_PATHS Set to TRUE to suppress searching in system
-# paths (or other locations outside of BOOST_ROOT
-# or BOOST_INCLUDEDIR). Useful when specifying
-# BOOST_ROOT. Defaults to OFF.
-# [Since CMake 2.8.3]
-#
-# Boost_NO_BOOST_CMAKE Do not do a find_package call in config mode
-# before searching for a regular boost install.
-# This will avoid finding boost-cmake installs.
-# Defaults to OFF.
-# [Since CMake 2.8.6]
-#
-# Boost_USE_STATIC_RUNTIME If enabled, searches for boost libraries
-# linked against a static C++ standard library
-# ('s' ABI tag). This option should be set to
-# ON or OFF because the default behavior
-# if not specified is platform dependent
-# for backwards compatibility.
-# [Since CMake 2.8.3]
-#
-# Boost_USE_DEBUG_PYTHON If enabled, searches for boost libraries
-# compiled against a special debug build of
-# Python ('y' ABI tag). Defaults to OFF.
-# [Since CMake 2.8.3]
-#
-# Boost_USE_STLPORT If enabled, searches for boost libraries
-# compiled against the STLPort standard
-# library ('p' ABI tag). Defaults to OFF.
-# [Since CMake 2.8.3]
-#
-# Boost_USE_STLPORT_DEPRECATED_NATIVE_IOSTREAMS
-# If enabled, searches for boost libraries
-# compiled against the deprecated STLPort
-# "native iostreams" feature ('n' ABI tag).
-# Defaults to OFF.
-# [Since CMake 2.8.3]
-#
-# Other Variables used by this module which you may want to set.
-#
-# Boost_ADDITIONAL_VERSIONS A list of version numbers to use for searching
-# the boost include directory. Please see
-# the documentation above regarding this
-# annoying, but necessary variable :(
-#
-# Boost_DEBUG Set this to TRUE to enable debugging output
-# of FindBoost.cmake if you are having problems.
-# Please enable this before filing any bug
-# reports.
-#
-# Boost_DETAILED_FAILURE_MSG FindBoost doesn't output detailed information
-# about why it failed or how to fix the problem
-# unless this is set to TRUE or the REQUIRED
-# keyword is specified in find_package().
-# [Since CMake 2.8.0]
-#
-# Boost_COMPILER Set this to the compiler suffix used by Boost
-# (e.g. "-gcc43") if FindBoost has problems finding
-# the proper Boost installation
-#
-# Boost_THREADAPI When building boost.thread, sometimes the name of the
-# library contains an additional "pthread" or "win32"
-# string known as the threadapi. This can happen when
-# compiling against pthreads on Windows or win32 threads
-# on Cygwin. You may specify this variable and if set
-# when FindBoost searches for the Boost threading library
-# it will first try to match the threadapi you specify.
-# For Example: libboost_thread_win32-mgw45-mt-1_43.a
-# might be found if you specified "win32" here before
-# falling back on libboost_thread-mgw45-mt-1_43.a.
-# [Since CMake 2.8.3]
-#
-# Boost_REALPATH Resolves symbolic links for discovered boost libraries
-# to assist with packaging. For example, instead of
-# Boost_SYSTEM_LIBRARY_RELEASE being resolved to
-# "/usr/lib/libboost_system.so" it would be
-# "/usr/lib/libboost_system.so.1.42.0" instead.
-# This does not affect linking and should not be
-# enabled unless the user needs this information.
-# [Since CMake 2.8.3]
-#
-
-
-#
-# These last three variables are available also as environment variables:
-# Also, note they are completely UPPERCASE, except Boost_DIR.
-#
-# Boost_DIR or The preferred installation prefix for searching for
-# BOOST_ROOT or BOOSTROOT Boost. Set this if the module has problems finding
-# the proper Boost installation.
-#
-# Note that Boost_DIR behaves exactly as <package>_DIR
-# variables are documented to behave in find_package's
-# Config mode. That is, if it is set as a -D argument
-# to CMake, it must point to the location of the
-# BoostConfig.cmake or Boost-config.cmake file. If it
-# is set as an environment variable, it must point to
-# the root of the boost installation. BOOST_ROOT and
-# BOOSTROOT, on the other hand, will point to the root
-# in either case.
-#
-# To prevent falling back on the system paths, set
-# Boost_NO_SYSTEM_PATHS to true.
-#
-# To avoid finding boost-cmake installations, set
-# Boost_NO_BOOST_CMAKE to true.
-#
-# BOOST_INCLUDEDIR Set this to the include directory of Boost, if the
-# module has problems finding the proper Boost installation
-#
-# BOOST_LIBRARYDIR Set this to the lib directory of Boost, if the
-# module has problems finding the proper Boost installation
-#
-# Variables defined by this module:
-#
-# Boost_FOUND System has Boost, this means the include dir was
-# found, as well as all the libraries specified in
-# the COMPONENTS list.
-#
-# Boost_INCLUDE_DIRS Boost include directories: not cached
-#
-# Boost_INCLUDE_DIR This is almost the same as above, but this one is
-# cached and may be modified by advanced users
-#
-# Boost_LIBRARIES Link to these to use the Boost libraries that you
-# specified: not cached
-#
-# Boost_LIBRARY_DIRS The path to where the Boost library files are.
-#
-# Boost_VERSION The version number of the boost libraries that
-# have been found, same as in version.hpp from Boost
-#
-# Boost_LIB_VERSION The version number in filename form as
-# it's appended to the library filenames
-#
-# Boost_MAJOR_VERSION major version number of boost
-# Boost_MINOR_VERSION minor version number of boost
-# Boost_SUBMINOR_VERSION subminor version number of boost
-#
-# Boost_LIB_DIAGNOSTIC_DEFINITIONS [WIN32 Only] You can call
-# add_definitions(${Boost_LIB_DIAGNOSTIC_DEFINITIONS})
-# to have diagnostic information about Boost's
-# automatic linking outputted during compilation time.
-#
-# For each component you specify in find_package(), the following (UPPER-CASE)
-# variables are set. You can use these variables if you would like to pick and
-# choose components for your targets instead of just using Boost_LIBRARIES.
-#
-# Boost_${COMPONENT}_FOUND True IF the Boost library "component" was found.
-#
-# Boost_${COMPONENT}_LIBRARY Contains the libraries for the specified Boost
-# "component" (includes debug and optimized keywords
-# when needed).
-
-#=============================================================================
-# Copyright 2006-2009 Kitware, Inc.
-# Copyright 2006-2008 Andreas Schneider <mail@cynapses.org>
-# Copyright 2007 Wengo
-# Copyright 2007 Mike Jackson
-# Copyright 2008 Andreas Pakulat <apaku@gmx.de>
-# Copyright 2008-2012 Philip Lowman <philip@yhbt.com>
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-# License text for the above reference.)
-
-
-#-------------------------------------------------------------------------------
-# Before we go searching, check whether boost-cmake is avaialble, unless the
-# user specifically asked NOT to search for boost-cmake.
-#
-# If Boost_DIR is set, this behaves as any find_package call would. If not,
-# it looks at BOOST_ROOT and BOOSTROOT to find Boost.
-#
-if (NOT Boost_NO_BOOST_CMAKE)
- # If Boost_DIR is not set, look for BOOSTROOT and BOOST_ROOT as alternatives,
- # since these are more conventional for Boost.
- if ("$ENV{Boost_DIR}" STREQUAL "")
- if (NOT "$ENV{BOOST_ROOT}" STREQUAL "")
- set(ENV{Boost_DIR} $ENV{BOOST_ROOT})
- elseif (NOT "$ENV{BOOSTROOT}" STREQUAL "")
- set(ENV{Boost_DIR} $ENV{BOOSTROOT})
- endif()
- endif()
-
- # Do the same find_package call but look specifically for the CMake version.
- # Note that args are passed in the Boost_FIND_xxxxx variables, so there is no
- # need to delegate them to this find_package call.
- find_package(Boost QUIET NO_MODULE)
-
- # If we found boost-cmake, then we're done. Print out what we found.
- # Otherwise let the rest of the module try to find it.
- if (Boost_FOUND)
- message("Boost ${Boost_FIND_VERSION} found.")
- if (Boost_FIND_COMPONENTS)
- message("Found Boost components:")
- message(" ${Boost_FIND_COMPONENTS}")
- endif()
- return()
- endif()
-endif()
-
-
-#-------------------------------------------------------------------------------
-# FindBoost functions & macros
-#
-
-############################################
-#
-# Check the existence of the libraries.
-#
-############################################
-# This macro was taken directly from the FindQt4.cmake file that is included
-# with the CMake distribution. This is NOT my work. All work was done by the
-# original authors of the FindQt4.cmake file. Only minor modifications were
-# made to remove references to Qt and make this file more generally applicable
-# And ELSE/ENDIF pairs were removed for readability.
-#########################################################################
-
-macro(_Boost_ADJUST_LIB_VARS basename)
- if(Boost_INCLUDE_DIR )
- if(Boost_${basename}_LIBRARY_DEBUG AND Boost_${basename}_LIBRARY_RELEASE)
- # if the generator supports configuration types then set
- # optimized and debug libraries, or if the CMAKE_BUILD_TYPE has a value
- if(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
- set(Boost_${basename}_LIBRARY optimized ${Boost_${basename}_LIBRARY_RELEASE} debug ${Boost_${basename}_LIBRARY_DEBUG})
- else()
- # if there are no configuration types and CMAKE_BUILD_TYPE has no value
- # then just use the release libraries
- set(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_RELEASE} )
- endif()
- # FIXME: This probably should be set for both cases
- set(Boost_${basename}_LIBRARIES optimized ${Boost_${basename}_LIBRARY_RELEASE} debug ${Boost_${basename}_LIBRARY_DEBUG})
- endif()
-
- # if only the release version was found, set the debug variable also to the release version
- if(Boost_${basename}_LIBRARY_RELEASE AND NOT Boost_${basename}_LIBRARY_DEBUG)
- set(Boost_${basename}_LIBRARY_DEBUG ${Boost_${basename}_LIBRARY_RELEASE})
- set(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_RELEASE})
- set(Boost_${basename}_LIBRARIES ${Boost_${basename}_LIBRARY_RELEASE})
- endif()
-
- # if only the debug version was found, set the release variable also to the debug version
- if(Boost_${basename}_LIBRARY_DEBUG AND NOT Boost_${basename}_LIBRARY_RELEASE)
- set(Boost_${basename}_LIBRARY_RELEASE ${Boost_${basename}_LIBRARY_DEBUG})
- set(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_DEBUG})
- set(Boost_${basename}_LIBRARIES ${Boost_${basename}_LIBRARY_DEBUG})
- endif()
-
- # If the debug & release library ends up being the same, omit the keywords
- if(${Boost_${basename}_LIBRARY_RELEASE} STREQUAL ${Boost_${basename}_LIBRARY_DEBUG})
- set(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY_RELEASE} )
- set(Boost_${basename}_LIBRARIES ${Boost_${basename}_LIBRARY_RELEASE} )
- endif()
-
- if(Boost_${basename}_LIBRARY)
- set(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY} CACHE FILEPATH "The Boost ${basename} library")
-
- # Remove superfluous "debug" / "optimized" keywords from
- # Boost_LIBRARY_DIRS
- foreach(_boost_my_lib ${Boost_${basename}_LIBRARY})
- get_filename_component(_boost_my_lib_path "${_boost_my_lib}" PATH)
- list(APPEND Boost_LIBRARY_DIRS ${_boost_my_lib_path})
- endforeach()
- list(REMOVE_DUPLICATES Boost_LIBRARY_DIRS)
-
- set(Boost_LIBRARY_DIRS ${Boost_LIBRARY_DIRS} CACHE FILEPATH "Boost library directory")
- set(Boost_${basename}_FOUND ON CACHE INTERNAL "Whether the Boost ${basename} library found")
- endif(Boost_${basename}_LIBRARY)
-
- endif(Boost_INCLUDE_DIR )
- # Make variables changeble to the advanced user
- mark_as_advanced(
- Boost_${basename}_LIBRARY
- Boost_${basename}_LIBRARY_RELEASE
- Boost_${basename}_LIBRARY_DEBUG
- )
-endmacro(_Boost_ADJUST_LIB_VARS)
-
-#-------------------------------------------------------------------------------
-
-#
-# Runs compiler with "-dumpversion" and parses major/minor
-# version with a regex.
-#
-function(_Boost_COMPILER_DUMPVERSION _OUTPUT_VERSION)
-
- exec_program(${CMAKE_CXX_COMPILER}
- ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
- OUTPUT_VARIABLE _boost_COMPILER_VERSION
- )
- string(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2"
- _boost_COMPILER_VERSION ${_boost_COMPILER_VERSION})
-
- set(${_OUTPUT_VERSION} ${_boost_COMPILER_VERSION} PARENT_SCOPE)
-endfunction()
-
-#
-# A convenience function for marking desired components
-# as found or not
-#
-function(_Boost_MARK_COMPONENTS_FOUND _yes_or_no)
- foreach(COMPONENT ${Boost_FIND_COMPONENTS})
- string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
- set(Boost_${UPPERCOMPONENT}_FOUND ${_yes_or_no} CACHE INTERNAL "Whether the Boost ${COMPONENT} library found" FORCE)
- endforeach()
-endfunction()
-
-#
-# Take a list of libraries with "thread" in it
-# and prepend duplicates with "thread_${Boost_THREADAPI}"
-# at the front of the list
-#
-function(_Boost_PREPEND_LIST_WITH_THREADAPI _output)
- set(_orig_libnames ${ARGN})
- string(REPLACE "thread" "thread_${Boost_THREADAPI}" _threadapi_libnames "${_orig_libnames}")
- set(${_output} ${_threadapi_libnames} ${_orig_libnames} PARENT_SCOPE)
-endfunction()
-
-#
-# If a library is found, replace its cache entry with its REALPATH
-#
-function(_Boost_SWAP_WITH_REALPATH _library _docstring)
- if(${_library})
- get_filename_component(_boost_filepathreal ${${_library}} REALPATH)
- unset(${_library} CACHE)
- set(${_library} ${_boost_filepathreal} CACHE FILEPATH "${_docstring}")
- endif()
-endfunction()
-
-function(_Boost_CHECK_SPELLING _var)
- if(${_var})
- string(TOUPPER ${_var} _var_UC)
- message(FATAL_ERROR "ERROR: ${_var} is not the correct spelling. The proper spelling is ${_var_UC}.")
- endif()
-endfunction()
-
-# Guesses Boost's compiler prefix used in built library names
-# Returns the guess by setting the variable pointed to by _ret
-function(_Boost_GUESS_COMPILER_PREFIX _ret)
- if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel"
- OR "${CMAKE_CXX_COMPILER}" MATCHES "icl"
- OR "${CMAKE_CXX_COMPILER}" MATCHES "icpc")
- if(WIN32)
- set (_boost_COMPILER "-iw")
- else()
- set (_boost_COMPILER "-il")
- endif()
- elseif (MSVC11)
- set(_boost_COMPILER "-vc110")
- elseif (MSVC10)
- set(_boost_COMPILER "-vc100")
- elseif (MSVC90)
- set(_boost_COMPILER "-vc90")
- elseif (MSVC80)
- set(_boost_COMPILER "-vc80")
- elseif (MSVC71)
- set(_boost_COMPILER "-vc71")
- elseif (MSVC70) # Good luck!
- set(_boost_COMPILER "-vc7") # yes, this is correct
- elseif (MSVC60) # Good luck!
- set(_boost_COMPILER "-vc6") # yes, this is correct
- elseif (BORLAND)
- set(_boost_COMPILER "-bcb")
- elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "SunPro")
- set(_boost_COMPILER "-sw")
- elseif (MINGW)
- if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34)
- set(_boost_COMPILER "-mgw") # no GCC version encoding prior to 1.34
- else()
- _Boost_COMPILER_DUMPVERSION(_boost_COMPILER_VERSION)
- set(_boost_COMPILER "-mgw${_boost_COMPILER_VERSION}")
- endif()
- elseif (UNIX)
- if (CMAKE_COMPILER_IS_GNUCXX)
- if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34)
- set(_boost_COMPILER "-gcc") # no GCC version encoding prior to 1.34
- else()
- _Boost_COMPILER_DUMPVERSION(_boost_COMPILER_VERSION)
- # Determine which version of GCC we have.
- if(APPLE)
- if(Boost_MINOR_VERSION)
- if(${Boost_MINOR_VERSION} GREATER 35)
- # In Boost 1.36.0 and newer, the mangled compiler name used
- # on Mac OS X/Darwin is "xgcc".
- set(_boost_COMPILER "-xgcc${_boost_COMPILER_VERSION}")
- else(${Boost_MINOR_VERSION} GREATER 35)
- # In Boost <= 1.35.0, there is no mangled compiler name for
- # the Mac OS X/Darwin version of GCC.
- set(_boost_COMPILER "")
- endif(${Boost_MINOR_VERSION} GREATER 35)
- else(Boost_MINOR_VERSION)
- # We don't know the Boost version, so assume it's
- # pre-1.36.0.
- set(_boost_COMPILER "")
- endif(Boost_MINOR_VERSION)
- else()
- set(_boost_COMPILER "-gcc${_boost_COMPILER_VERSION}")
- endif()
- endif()
- endif (CMAKE_COMPILER_IS_GNUCXX)
- else()
- # TODO at least Boost_DEBUG here?
- set(_boost_COMPILER "")
- endif()
- set(${_ret} ${_boost_COMPILER} PARENT_SCOPE)
-endfunction()
-
-#
-# End functions/macros
-#
-#-------------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------------
-# main.
-#-------------------------------------------------------------------------------
-
-if(NOT DEFINED Boost_USE_MULTITHREADED)
- set(Boost_USE_MULTITHREADED TRUE)
-endif()
-
-# Check the version of Boost against the requested version.
-if(Boost_FIND_VERSION AND NOT Boost_FIND_VERSION_MINOR)
- message(SEND_ERROR "When requesting a specific version of Boost, you must provide at least the major and minor version numbers, e.g., 1.34")
-endif()
-
-if(Boost_FIND_VERSION_EXACT)
- # The version may appear in a directory with or without the patch
- # level, even when the patch level is non-zero.
- set(_boost_TEST_VERSIONS
- "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}.${Boost_FIND_VERSION_PATCH}"
- "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
-else(Boost_FIND_VERSION_EXACT)
- # The user has not requested an exact version. Among known
- # versions, find those that are acceptable to the user request.
- set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
- "1.56.0" "1.56" "1.55.0" "1.55" "1.54.0" "1.54"
- "1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51"
- "1.50.0" "1.50" "1.49.0" "1.49" "1.48.0" "1.48" "1.47.0" "1.47" "1.46.1"
- "1.46.0" "1.46" "1.45.0" "1.45" "1.44.0" "1.44" "1.43.0" "1.43" "1.42.0" "1.42"
- "1.41.0" "1.41" "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37"
- "1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0"
- "1.34" "1.33.1" "1.33.0" "1.33")
- set(_boost_TEST_VERSIONS)
- if(Boost_FIND_VERSION)
- set(_Boost_FIND_VERSION_SHORT "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
- # Select acceptable versions.
- foreach(version ${_Boost_KNOWN_VERSIONS})
- if(NOT "${version}" VERSION_LESS "${Boost_FIND_VERSION}")
- # This version is high enough.
- list(APPEND _boost_TEST_VERSIONS "${version}")
- elseif("${version}.99" VERSION_EQUAL "${_Boost_FIND_VERSION_SHORT}.99")
- # This version is a short-form for the requested version with
- # the patch level dropped.
- list(APPEND _boost_TEST_VERSIONS "${version}")
- endif()
- endforeach(version)
- else(Boost_FIND_VERSION)
- # Any version is acceptable.
- set(_boost_TEST_VERSIONS "${_Boost_KNOWN_VERSIONS}")
- endif(Boost_FIND_VERSION)
-endif(Boost_FIND_VERSION_EXACT)
-
-# The reason that we failed to find Boost. This will be set to a
-# user-friendly message when we fail to find some necessary piece of
-# Boost.
-set(Boost_ERROR_REASON)
-
- if(Boost_DEBUG)
- # Output some of their choices
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_TEST_VERSIONS = ${_boost_TEST_VERSIONS}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "Boost_USE_MULTITHREADED = ${Boost_USE_MULTITHREADED}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "Boost_USE_STATIC_LIBS = ${Boost_USE_STATIC_LIBS}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "Boost_USE_STATIC_RUNTIME = ${Boost_USE_STATIC_RUNTIME}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "Boost_ADDITIONAL_VERSIONS = ${Boost_ADDITIONAL_VERSIONS}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "Boost_NO_SYSTEM_PATHS = ${Boost_NO_SYSTEM_PATHS}")
- endif()
-
- if(WIN32)
- # In windows, automatic linking is performed, so you do not have
- # to specify the libraries. If you are linking to a dynamic
- # runtime, then you can choose to link to either a static or a
- # dynamic Boost library, the default is to do a static link. You
- # can alter this for a specific library "whatever" by defining
- # BOOST_WHATEVER_DYN_LINK to force Boost library "whatever" to be
- # linked dynamically. Alternatively you can force all Boost
- # libraries to dynamic link by defining BOOST_ALL_DYN_LINK.
-
- # This feature can be disabled for Boost library "whatever" by
- # defining BOOST_WHATEVER_NO_LIB, or for all of Boost by defining
- # BOOST_ALL_NO_LIB.
-
- # If you want to observe which libraries are being linked against
- # then defining BOOST_LIB_DIAGNOSTIC will cause the auto-linking
- # code to emit a #pragma message each time a library is selected
- # for linking.
- set(Boost_LIB_DIAGNOSTIC_DEFINITIONS
- "-DBOOST_LIB_DIAGNOSTIC" CACHE STRING "Boost diagnostic define")
- endif(WIN32)
-
- set(_boost_INCLUDE_SEARCH_DIRS_SYSTEM
- C:/boost/include
- C:/boost
- "$ENV{ProgramFiles}/boost/include"
- "$ENV{ProgramFiles}/boost"
- /sw/local/include
- )
-
- _Boost_CHECK_SPELLING(Boost_ROOT)
- _Boost_CHECK_SPELLING(Boost_LIBRARYDIR)
- _Boost_CHECK_SPELLING(Boost_INCLUDEDIR)
-
- # If BOOST_ROOT was defined in the environment, use it.
- if (NOT BOOST_ROOT AND NOT $ENV{Boost_DIR} STREQUAL "")
- set(BOOST_ROOT $ENV{Boost_DIR})
- endif()
-
- # If BOOST_ROOT was defined in the environment, use it.
- if (NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "")
- set(BOOST_ROOT $ENV{BOOST_ROOT})
- endif()
-
- # If BOOSTROOT was defined in the environment, use it.
- if (NOT BOOST_ROOT AND NOT $ENV{BOOSTROOT} STREQUAL "")
- set(BOOST_ROOT $ENV{BOOSTROOT})
- endif()
-
- # If BOOST_INCLUDEDIR was defined in the environment, use it.
- if( NOT $ENV{BOOST_INCLUDEDIR} STREQUAL "" )
- set(BOOST_INCLUDEDIR $ENV{BOOST_INCLUDEDIR})
- endif()
-
- # If BOOST_LIBRARYDIR was defined in the environment, use it.
- if( NOT $ENV{BOOST_LIBRARYDIR} STREQUAL "" )
- set(BOOST_LIBRARYDIR $ENV{BOOST_LIBRARYDIR})
- endif()
-
- if( BOOST_ROOT )
- file(TO_CMAKE_PATH ${BOOST_ROOT} BOOST_ROOT)
- endif()
-
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "Declared as CMake or Environmental Variables:")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- " BOOST_ROOT = ${BOOST_ROOT}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- " BOOST_INCLUDEDIR = ${BOOST_INCLUDEDIR}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- " BOOST_LIBRARYDIR = ${BOOST_LIBRARYDIR}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_TEST_VERSIONS = ${_boost_TEST_VERSIONS}")
- endif()
-
- if( Boost_NO_SYSTEM_PATHS)
- set(_boost_FIND_OPTIONS NO_CMAKE_SYSTEM_PATH)
- else()
- set(_boost_INCLUDE_SEARCH_DIRS ${_boost_INCLUDE_SEARCH_DIRS_SYSTEM})
- endif()
-
- if( BOOST_ROOT )
- set(_boost_INCLUDE_SEARCH_DIRS
- ${BOOST_ROOT}/include
- ${BOOST_ROOT}
- ${_boost_INCLUDE_SEARCH_DIRS})
- endif()
-
- # prepend BOOST_INCLUDEDIR to search path if specified
- if( BOOST_INCLUDEDIR )
- file(TO_CMAKE_PATH ${BOOST_INCLUDEDIR} BOOST_INCLUDEDIR)
- set(_boost_INCLUDE_SEARCH_DIRS
- ${BOOST_INCLUDEDIR} ${_boost_INCLUDE_SEARCH_DIRS})
- endif( BOOST_INCLUDEDIR )
-
- # ------------------------------------------------------------------------
- # Search for Boost include DIR
- # ------------------------------------------------------------------------
- # Try to find Boost by stepping backwards through the Boost versions
- # we know about.
- if( NOT Boost_INCLUDE_DIR )
- # Build a list of path suffixes for each version.
- set(_boost_PATH_SUFFIXES)
- foreach(_boost_VER ${_boost_TEST_VERSIONS})
- # Add in a path suffix, based on the required version, ideally
- # we could read this from version.hpp, but for that to work we'd
- # need to know the include dir already
- set(_boost_BOOSTIFIED_VERSION)
-
- # Transform 1.35 => 1_35 and 1.36.0 => 1_36_0
- if(_boost_VER MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1_\\2_\\3"
- _boost_BOOSTIFIED_VERSION ${_boost_VER})
- elseif(_boost_VER MATCHES "[0-9]+\\.[0-9]+")
- string(REGEX REPLACE "([0-9]+)\\.([0-9]+)" "\\1_\\2"
- _boost_BOOSTIFIED_VERSION ${_boost_VER})
- endif()
-
- list(APPEND _boost_PATH_SUFFIXES "boost-${_boost_BOOSTIFIED_VERSION}")
- list(APPEND _boost_PATH_SUFFIXES "boost_${_boost_BOOSTIFIED_VERSION}")
-
- endforeach(_boost_VER)
-
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "Include debugging info:")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- " _boost_INCLUDE_SEARCH_DIRS = ${_boost_INCLUDE_SEARCH_DIRS}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- " _boost_PATH_SUFFIXES = ${_boost_PATH_SUFFIXES}")
- endif()
-
- # Look for a standard boost header file.
- find_path(Boost_INCLUDE_DIR
- NAMES boost/config.hpp
- HINTS ${_boost_INCLUDE_SEARCH_DIRS}
- PATH_SUFFIXES ${_boost_PATH_SUFFIXES}
- ${_boost_FIND_OPTIONS}
- )
- endif( NOT Boost_INCLUDE_DIR )
-
- # ------------------------------------------------------------------------
- # Extract version information from version.hpp
- # ------------------------------------------------------------------------
-
- if(Boost_INCLUDE_DIR)
- # Extract Boost_VERSION and Boost_LIB_VERSION from version.hpp
- # Read the whole file:
- #
- set(BOOST_VERSION 0)
- set(BOOST_LIB_VERSION "")
- file(READ "${Boost_INCLUDE_DIR}/boost/version.hpp" _boost_VERSION_HPP_CONTENTS)
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "location of version.hpp: ${Boost_INCLUDE_DIR}/boost/version.hpp")
- endif()
-
- string(REGEX REPLACE ".*#define BOOST_VERSION ([0-9]+).*" "\\1" Boost_VERSION "${_boost_VERSION_HPP_CONTENTS}")
- string(REGEX REPLACE ".*#define BOOST_LIB_VERSION \"([0-9_]+)\".*" "\\1" Boost_LIB_VERSION "${_boost_VERSION_HPP_CONTENTS}")
-
- set(Boost_LIB_VERSION ${Boost_LIB_VERSION} CACHE INTERNAL "The library version string for boost libraries")
- set(Boost_VERSION ${Boost_VERSION} CACHE INTERNAL "The version number for boost libraries")
-
- if(NOT "${Boost_VERSION}" STREQUAL "0")
- math(EXPR Boost_MAJOR_VERSION "${Boost_VERSION} / 100000")
- math(EXPR Boost_MINOR_VERSION "${Boost_VERSION} / 100 % 1000")
- math(EXPR Boost_SUBMINOR_VERSION "${Boost_VERSION} % 100")
-
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}\nBoost include path: ${Boost_INCLUDE_DIR}")
- endif(NOT "${Boost_VERSION}" STREQUAL "0")
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "version.hpp reveals boost "
- "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
- endif()
- else(Boost_INCLUDE_DIR)
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}Unable to find the Boost header files. Please set BOOST_ROOT to the root directory containing Boost or BOOST_INCLUDEDIR to the directory containing Boost's headers.")
- endif(Boost_INCLUDE_DIR)
-
- # ------------------------------------------------------------------------
- # Suffix initialization and compiler suffix detection.
- # ------------------------------------------------------------------------
-
- # Setting some more suffixes for the library
- set(Boost_LIB_PREFIX "")
- if ( WIN32 AND Boost_USE_STATIC_LIBS AND NOT CYGWIN)
- set(Boost_LIB_PREFIX "lib")
- endif()
-
- if (Boost_COMPILER)
- set(_boost_COMPILER ${Boost_COMPILER})
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "using user-specified Boost_COMPILER = ${_boost_COMPILER}")
- endif()
- else()
- # Attempt to guess the compiler suffix
- # NOTE: this is not perfect yet, if you experience any issues
- # please report them and use the Boost_COMPILER variable
- # to work around the problems.
- _Boost_GUESS_COMPILER_PREFIX(_boost_COMPILER)
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "guessed _boost_COMPILER = ${_boost_COMPILER}")
- endif()
- endif()
-
- set (_boost_MULTITHREADED "-mt")
- if( NOT Boost_USE_MULTITHREADED )
- set (_boost_MULTITHREADED "")
- endif()
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_MULTITHREADED = ${_boost_MULTITHREADED}")
- endif()
-
- #======================
- # Systematically build up the Boost ABI tag
- # http://boost.org/doc/libs/1_41_0/more/getting_started/windows.html#library-naming
- set( _boost_RELEASE_ABI_TAG "-")
- set( _boost_DEBUG_ABI_TAG "-")
- # Key Use this library when:
- # s linking statically to the C++ standard library and
- # compiler runtime support libraries.
- if(Boost_USE_STATIC_RUNTIME)
- set( _boost_RELEASE_ABI_TAG "${_boost_RELEASE_ABI_TAG}s")
- set( _boost_DEBUG_ABI_TAG "${_boost_DEBUG_ABI_TAG}s")
- endif()
- # g using debug versions of the standard and runtime
- # support libraries
- if(WIN32)
- if(MSVC OR "${CMAKE_CXX_COMPILER}" MATCHES "icl"
- OR "${CMAKE_CXX_COMPILER}" MATCHES "icpc")
- set(_boost_DEBUG_ABI_TAG "${_boost_DEBUG_ABI_TAG}g")
- endif()
- endif()
- # y using special debug build of python
- if(Boost_USE_DEBUG_PYTHON)
- set(_boost_DEBUG_ABI_TAG "${_boost_DEBUG_ABI_TAG}y")
- endif()
- # d using a debug version of your code
- set(_boost_DEBUG_ABI_TAG "${_boost_DEBUG_ABI_TAG}d")
- # p using the STLport standard library rather than the
- # default one supplied with your compiler
- if(Boost_USE_STLPORT)
- set( _boost_RELEASE_ABI_TAG "${_boost_RELEASE_ABI_TAG}p")
- set( _boost_DEBUG_ABI_TAG "${_boost_DEBUG_ABI_TAG}p")
- endif()
- # n using the STLport deprecated "native iostreams" feature
- if(Boost_USE_STLPORT_DEPRECATED_NATIVE_IOSTREAMS)
- set( _boost_RELEASE_ABI_TAG "${_boost_RELEASE_ABI_TAG}n")
- set( _boost_DEBUG_ABI_TAG "${_boost_DEBUG_ABI_TAG}n")
- endif()
-
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_RELEASE_ABI_TAG = ${_boost_RELEASE_ABI_TAG}")
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_DEBUG_ABI_TAG = ${_boost_DEBUG_ABI_TAG}")
- endif()
-
- # ------------------------------------------------------------------------
- # Begin finding boost libraries
- # ------------------------------------------------------------------------
-
- if(BOOST_ROOT)
- set(_boost_LIBRARY_SEARCH_DIRS_ALWAYS
- ${BOOST_ROOT}/lib
- ${BOOST_ROOT}/stage/lib)
- endif()
- set(_boost_LIBRARY_SEARCH_DIRS_ALWAYS
- ${_boost_LIBRARY_SEARCH_DIRS_ALWAYS}
- ${Boost_INCLUDE_DIR}/lib
- ${Boost_INCLUDE_DIR}/../lib
- ${Boost_INCLUDE_DIR}/stage/lib
- )
- set(_boost_LIBRARY_SEARCH_DIRS_SYSTEM
- C:/boost/lib
- C:/boost
- "$ENV{ProgramFiles}/boost/boost_${Boost_MAJOR_VERSION}_${Boost_MINOR_VERSION}_${Boost_SUBMINOR_VERSION}/lib"
- "$ENV{ProgramFiles}/boost/boost_${Boost_MAJOR_VERSION}_${Boost_MINOR_VERSION}/lib"
- "$ENV{ProgramFiles}/boost/lib"
- "$ENV{ProgramFiles}/boost"
- /sw/local/lib
- )
- set(_boost_LIBRARY_SEARCH_DIRS ${_boost_LIBRARY_SEARCH_DIRS_ALWAYS})
- if( Boost_NO_SYSTEM_PATHS )
- set(_boost_FIND_OPTIONS NO_CMAKE_SYSTEM_PATH)
- else()
- list(APPEND _boost_LIBRARY_SEARCH_DIRS ${_boost_LIBRARY_SEARCH_DIRS_SYSTEM})
- endif()
-
- # prepend BOOST_LIBRARYDIR to search path if specified
- if( BOOST_LIBRARYDIR )
- file(TO_CMAKE_PATH ${BOOST_LIBRARYDIR} BOOST_LIBRARYDIR)
- set(_boost_LIBRARY_SEARCH_DIRS
- ${BOOST_LIBRARYDIR} ${_boost_LIBRARY_SEARCH_DIRS})
- endif()
-
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "_boost_LIBRARY_SEARCH_DIRS = ${_boost_LIBRARY_SEARCH_DIRS}")
- endif()
-
- # Support preference of static libs by adjusting CMAKE_FIND_LIBRARY_SUFFIXES
- if( Boost_USE_STATIC_LIBS )
- set( _boost_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
- if(WIN32)
- set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
- else()
- set(CMAKE_FIND_LIBRARY_SUFFIXES .a )
- endif()
- endif()
-
- # We want to use the tag inline below without risking double dashes
- if(_boost_RELEASE_ABI_TAG)
- if(${_boost_RELEASE_ABI_TAG} STREQUAL "-")
- set(_boost_RELEASE_ABI_TAG "")
- endif()
- endif()
- if(_boost_DEBUG_ABI_TAG)
- if(${_boost_DEBUG_ABI_TAG} STREQUAL "-")
- set(_boost_DEBUG_ABI_TAG "")
- endif()
- endif()
-
- # The previous behavior of FindBoost when Boost_USE_STATIC_LIBS was enabled
- # on WIN32 was to:
- # 1. Search for static libs compiled against a SHARED C++ standard runtime library (use if found)
- # 2. Search for static libs compiled against a STATIC C++ standard runtime library (use if found)
- # We maintain this behavior since changing it could break people's builds.
- # To disable the ambiguous behavior, the user need only
- # set Boost_USE_STATIC_RUNTIME either ON or OFF.
- set(_boost_STATIC_RUNTIME_WORKAROUND false)
- if(WIN32 AND Boost_USE_STATIC_LIBS)
- if(NOT DEFINED Boost_USE_STATIC_RUNTIME)
- set(_boost_STATIC_RUNTIME_WORKAROUND true)
- endif()
- endif()
-
- # On versions < 1.35, remove the System library from the considered list
- # since it wasn't added until 1.35.
- if(Boost_VERSION AND Boost_FIND_COMPONENTS)
- if(Boost_VERSION LESS 103500)
- list(REMOVE_ITEM Boost_FIND_COMPONENTS system)
- endif()
- endif()
-
- foreach(COMPONENT ${Boost_FIND_COMPONENTS})
- string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
- set( Boost_${UPPERCOMPONENT}_LIBRARY "Boost_${UPPERCOMPONENT}_LIBRARY-NOTFOUND" )
- set( Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE "Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE-NOTFOUND" )
- set( Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG "Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG-NOTFOUND")
-
- set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
- set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)")
-
- #
- # Find RELEASE libraries
- #
- set(_boost_RELEASE_NAMES
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT} )
- if(_boost_STATIC_RUNTIME_WORKAROUND)
- set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
- list(APPEND _boost_RELEASE_NAMES
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
- endif()
- if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
- _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
- endif()
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "Searching for ${UPPERCOMPONENT}_LIBRARY_RELEASE: ${_boost_RELEASE_NAMES}")
- endif()
- find_library(Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE
- NAMES ${_boost_RELEASE_NAMES}
- HINTS ${_boost_LIBRARY_SEARCH_DIRS}
- ${_boost_FIND_OPTIONS}
- DOC "${_boost_docstring_release}"
- )
-
- #
- # Find DEBUG libraries
- #
- set(_boost_DEBUG_NAMES
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
- ${Boost_LIB_PREFIX}boost_${COMPONENT} )
- if(_boost_STATIC_RUNTIME_WORKAROUND)
- set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
- list(APPEND _boost_DEBUG_NAMES
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
- endif()
- if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
- _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})
- endif()
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
- "Searching for ${UPPERCOMPONENT}_LIBRARY_DEBUG: ${_boost_DEBUG_NAMES}")
- endif()
- find_library(Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG
- NAMES ${_boost_DEBUG_NAMES}
- HINTS ${_boost_LIBRARY_SEARCH_DIRS}
- ${_boost_FIND_OPTIONS}
- DOC "${_boost_docstring_debug}"
- )
-
- if(Boost_REALPATH)
- _Boost_SWAP_WITH_REALPATH(Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE "${_boost_docstring_release}")
- _Boost_SWAP_WITH_REALPATH(Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG "${_boost_docstring_debug}" )
- endif()
-
- _Boost_ADJUST_LIB_VARS(${UPPERCOMPONENT})
-
- endforeach(COMPONENT)
-
- # Restore the original find library ordering
- if( Boost_USE_STATIC_LIBS )
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_boost_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
- endif()
-
- # ------------------------------------------------------------------------
- # End finding boost libraries
- # ------------------------------------------------------------------------
-
- # ------------------------------------------------------------------------
- # Begin long process of determining Boost_FOUND, starting with version
- # number checks, followed by
- # TODO: Ideally the version check logic should happen prior to searching
- # for libraries...
- # ------------------------------------------------------------------------
-
- set(Boost_INCLUDE_DIRS
- ${Boost_INCLUDE_DIR}
- )
-
- set(Boost_FOUND FALSE)
- if(Boost_INCLUDE_DIR)
- set( Boost_FOUND TRUE )
-
- if(Boost_MAJOR_VERSION LESS "${Boost_FIND_VERSION_MAJOR}" )
- set( Boost_FOUND FALSE )
- set(_Boost_VERSION_AGE "old")
- elseif(Boost_MAJOR_VERSION EQUAL "${Boost_FIND_VERSION_MAJOR}" )
- if(Boost_MINOR_VERSION LESS "${Boost_FIND_VERSION_MINOR}" )
- set( Boost_FOUND FALSE )
- set(_Boost_VERSION_AGE "old")
- elseif(Boost_MINOR_VERSION EQUAL "${Boost_FIND_VERSION_MINOR}" )
- if( Boost_FIND_VERSION_PATCH AND Boost_SUBMINOR_VERSION LESS "${Boost_FIND_VERSION_PATCH}" )
- set( Boost_FOUND FALSE )
- set(_Boost_VERSION_AGE "old")
- endif( Boost_FIND_VERSION_PATCH AND Boost_SUBMINOR_VERSION LESS "${Boost_FIND_VERSION_PATCH}" )
- endif( Boost_MINOR_VERSION LESS "${Boost_FIND_VERSION_MINOR}" )
- endif( Boost_MAJOR_VERSION LESS "${Boost_FIND_VERSION_MAJOR}" )
-
- if (NOT Boost_FOUND)
- _Boost_MARK_COMPONENTS_FOUND(OFF)
- endif()
-
- if (Boost_FOUND AND Boost_FIND_VERSION_EXACT)
- # If the user requested an exact version of Boost, check
- # that. We already know that the Boost version we have is >= the
- # requested version.
- set(_Boost_VERSION_AGE "new")
-
- # If the user didn't specify a patchlevel, it's 0.
- if (NOT Boost_FIND_VERSION_PATCH)
- set(Boost_FIND_VERSION_PATCH 0)
- endif (NOT Boost_FIND_VERSION_PATCH)
-
- # We'll set Boost_FOUND true again if we have an exact version match.
- set(Boost_FOUND FALSE)
- _Boost_MARK_COMPONENTS_FOUND(OFF)
- if(Boost_MAJOR_VERSION EQUAL "${Boost_FIND_VERSION_MAJOR}" )
- if(Boost_MINOR_VERSION EQUAL "${Boost_FIND_VERSION_MINOR}" )
- if(Boost_SUBMINOR_VERSION EQUAL "${Boost_FIND_VERSION_PATCH}" )
- set( Boost_FOUND TRUE )
- _Boost_MARK_COMPONENTS_FOUND(ON)
- endif(Boost_SUBMINOR_VERSION EQUAL "${Boost_FIND_VERSION_PATCH}" )
- endif( Boost_MINOR_VERSION EQUAL "${Boost_FIND_VERSION_MINOR}" )
- endif( Boost_MAJOR_VERSION EQUAL "${Boost_FIND_VERSION_MAJOR}" )
- endif (Boost_FOUND AND Boost_FIND_VERSION_EXACT)
-
- if(NOT Boost_FOUND)
- # State that we found a version of Boost that is too new or too old.
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}\nDetected version of Boost is too ${_Boost_VERSION_AGE}. Requested version was ${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
- if (Boost_FIND_VERSION_PATCH)
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}.${Boost_FIND_VERSION_PATCH}")
- endif (Boost_FIND_VERSION_PATCH)
- if (NOT Boost_FIND_VERSION_EXACT)
- set(Boost_ERROR_REASON "${Boost_ERROR_REASON} (or newer)")
- endif (NOT Boost_FIND_VERSION_EXACT)
- set(Boost_ERROR_REASON "${Boost_ERROR_REASON}.")
- endif (NOT Boost_FOUND)
-
- # Always check for missing components
- set(_boost_CHECKED_COMPONENT FALSE)
- set(_Boost_MISSING_COMPONENTS "")
- foreach(COMPONENT ${Boost_FIND_COMPONENTS})
- string(TOUPPER ${COMPONENT} COMPONENT)
- set(_boost_CHECKED_COMPONENT TRUE)
- if(NOT Boost_${COMPONENT}_FOUND)
- string(TOLOWER ${COMPONENT} COMPONENT)
- list(APPEND _Boost_MISSING_COMPONENTS ${COMPONENT})
- set( Boost_FOUND FALSE)
- endif()
- endforeach(COMPONENT)
-
- if(Boost_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] Boost_FOUND = ${Boost_FOUND}")
- endif()
-
- if (_Boost_MISSING_COMPONENTS)
- # We were unable to find some libraries, so generate a sensible
- # error message that lists the libraries we were unable to find.
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}\nThe following Boost libraries could not be found:\n")
- foreach(COMPONENT ${_Boost_MISSING_COMPONENTS})
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON} boost_${COMPONENT}\n")
- endforeach(COMPONENT)
-
- list(LENGTH Boost_FIND_COMPONENTS Boost_NUM_COMPONENTS_WANTED)
- list(LENGTH _Boost_MISSING_COMPONENTS Boost_NUM_MISSING_COMPONENTS)
- if (${Boost_NUM_COMPONENTS_WANTED} EQUAL ${Boost_NUM_MISSING_COMPONENTS})
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}No Boost libraries were found. You may need to set BOOST_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT to the location of Boost.")
- else (${Boost_NUM_COMPONENTS_WANTED} EQUAL ${Boost_NUM_MISSING_COMPONENTS})
- set(Boost_ERROR_REASON
- "${Boost_ERROR_REASON}Some (but not all) of the required Boost libraries were found. You may need to install these additional Boost libraries. Alternatively, set BOOST_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT to the location of Boost.")
- endif (${Boost_NUM_COMPONENTS_WANTED} EQUAL ${Boost_NUM_MISSING_COMPONENTS})
- endif (_Boost_MISSING_COMPONENTS)
-
- if( NOT Boost_LIBRARY_DIRS AND NOT _boost_CHECKED_COMPONENT )
- # Compatibility Code for backwards compatibility with CMake
- # 2.4's FindBoost module.
-
- # Look for the boost library path.
- # Note that the user may not have installed any libraries
- # so it is quite possible the Boost_LIBRARY_DIRS may not exist.
- set(_boost_LIB_DIR ${Boost_INCLUDE_DIR})
-
- if("${_boost_LIB_DIR}" MATCHES "boost-[0-9]+")
- get_filename_component(_boost_LIB_DIR ${_boost_LIB_DIR} PATH)
- endif()
-
- if("${_boost_LIB_DIR}" MATCHES "/include$")
- # Strip off the trailing "/include" in the path.
- get_filename_component(_boost_LIB_DIR ${_boost_LIB_DIR} PATH)
- endif()
-
- if(EXISTS "${_boost_LIB_DIR}/lib")
- set(_boost_LIB_DIR ${_boost_LIB_DIR}/lib)
- else()
- if(EXISTS "${_boost_LIB_DIR}/stage/lib")
- set(_boost_LIB_DIR ${_boost_LIB_DIR}/stage/lib)
- else()
- set(_boost_LIB_DIR "")
- endif()
- endif()
-
- if(_boost_LIB_DIR AND EXISTS "${_boost_LIB_DIR}")
- set(Boost_LIBRARY_DIRS ${_boost_LIB_DIR} CACHE FILEPATH "Boost library directory")
- endif()
-
- endif( NOT Boost_LIBRARY_DIRS AND NOT _boost_CHECKED_COMPONENT )
-
- else(Boost_INCLUDE_DIR)
- set( Boost_FOUND FALSE)
- endif(Boost_INCLUDE_DIR)
-
- # ------------------------------------------------------------------------
- # Notification to end user about what was found
- # ------------------------------------------------------------------------
-
- if(Boost_FOUND)
- if(NOT Boost_FIND_QUIETLY)
- message(STATUS "Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
- if(Boost_FIND_COMPONENTS)
- message(STATUS "Found the following Boost libraries:")
- endif()
- endif(NOT Boost_FIND_QUIETLY)
- foreach( COMPONENT ${Boost_FIND_COMPONENTS} )
- string( TOUPPER ${COMPONENT} UPPERCOMPONENT )
- if( Boost_${UPPERCOMPONENT}_FOUND )
- if(NOT Boost_FIND_QUIETLY)
- message (STATUS " ${COMPONENT}")
- endif(NOT Boost_FIND_QUIETLY)
- set(Boost_LIBRARIES ${Boost_LIBRARIES} ${Boost_${UPPERCOMPONENT}_LIBRARY})
- endif( Boost_${UPPERCOMPONENT}_FOUND )
- endforeach(COMPONENT)
- else()
- if(Boost_FIND_REQUIRED)
- message(SEND_ERROR "Unable to find the requested Boost libraries.\n${Boost_ERROR_REASON}")
- else()
- if(NOT Boost_FIND_QUIETLY)
- # we opt not to automatically output Boost_ERROR_REASON here as
- # it could be quite lengthy and somewhat imposing in its requests
- # Since Boost is not always a required dependency we'll leave this
- # up to the end-user.
- if(Boost_DEBUG OR Boost_DETAILED_FAILURE_MSG)
- message(STATUS "Could NOT find Boost\n${Boost_ERROR_REASON}")
- else()
- message(STATUS "Could NOT find Boost")
- endif()
- endif()
- endif(Boost_FIND_REQUIRED)
- endif()
-
- # show the Boost_INCLUDE_DIRS AND Boost_LIBRARIES variables only in the advanced view
- mark_as_advanced(Boost_INCLUDE_DIR
- Boost_INCLUDE_DIRS
- Boost_LIBRARY_DIRS
- )
diff --git a/cmake_support/FindNumpy.cmake b/cmake_support/FindNumpy.cmake
index e5bd94454..2f67a64ed 100644
--- a/cmake_support/FindNumpy.cmake
+++ b/cmake_support/FindNumpy.cmake
@@ -5,8 +5,8 @@ endif (PYTHON_NUMPY_INCLUDE_DIR)
#INCLUDE(FindPython)
-IF(PYTHON_BINARY)
- EXEC_PROGRAM ("${PYTHON_BINARY}"
+IF(Python_EXECUTABLE)
+ EXEC_PROGRAM ("${Python_EXECUTABLE}"
ARGS "-c 'import numpy; print(numpy.get_include())'"
OUTPUT_VARIABLE PYTHON_NUMPY_INCLUDE_DIR
RETURN_VALUE PYTHON_NUMPY_NOT_FOUND)
@@ -16,7 +16,7 @@ IF(PYTHON_BINARY)
set (PYTHON_NUMPY_FOUND TRUE)
set (PYTHON_NUMPY_INCLUDE_DIR ${PYTHON_NUMPY_INCLUDE_DIR} CACHE STRING "Numpy include path")
endif (PYTHON_NUMPY_NOT_FOUND)
-ENDIF(PYTHON_BINARY)
+ENDIF(Python_EXECUTABLE)
if (PYTHON_NUMPY_FOUND)
if (NOT PYTHON_NUMPY_FIND_QUIETLY)
diff --git a/cmake_support/FindOPENSTRUCTURE.cmake b/cmake_support/FindOPENSTRUCTURE.cmake
index eee4c7357..2fea7c673 100644
--- a/cmake_support/FindOPENSTRUCTURE.cmake
+++ b/cmake_support/FindOPENSTRUCTURE.cmake
@@ -25,7 +25,7 @@ macro(find_OPENSTRUCTURE OPENSTRUCTURE_ROOT NAMES HEADER_NAMES)
set(FOUND_LIB FOUND_LIB-NOTFOUND)
find_library(FOUND_LIB
NAMES ost_${LIB}
- HINTS "${PYTHON_ROOT}"
+ HINTS "${Python_ROOT_DIR}"
PATH ${OPENSTRUCTURE_ROOT}
PATH_SUFFIXES lib lib64
NO_SYSTEM_ENVIRONMENT_PATH NO_DEFAULT_PATH
@@ -84,4 +84,4 @@ else (OPENSTRUCTURE_FOUND)
if (OPENSTRUCTURE_FIND_REQUIRED)
message(FATAL_ERROR "Could not find OpenStructure")
endif ()
-endif ()
\ No newline at end of file
+endif ()
diff --git a/cmake_support/FindPython.cmake b/cmake_support/FindPython.cmake
deleted file mode 100644
index 64e220bc6..000000000
--- a/cmake_support/FindPython.cmake
+++ /dev/null
@@ -1,184 +0,0 @@
-#-------------------------------------------------------------------------------
-# Check for Python Libraries
-#
-# PYTHON_IGNORE_FRAMEWORKS if set, do not check for python frameworks.
-# has meaning on macOS only
-# PYTHON_ROOT Prefix for python libraries
-# PYTHON_MIN_VERSION minimal python version required
-#
-# When Python is found, the result is placed in the following variables:
-#
-# PYTHON_LIBRARIES is set to the library and linker flags used to
-# link against python
-# PYTHON_VERSION is set to the version of python
-# PYTHON_INCLUDE_PATH is set to the path that contains Python.h
-# PYTHON_BINARY is set to the path to the python executable
-#
-# Author: Marco Biasini
-#-------------------------------------------------------------------------------
-
-set(PYTHON_VERSIONS 3.9 3.8 3.7 3.6 )
-set(PYTHON_MIN_VERSION 3.6.0)
-
-#-------------------------------------------------------------------------------
-# check for python framework
-# this macro honours the values of PYTHON_ROOT
-#-------------------------------------------------------------------------------
-macro(check_for_python_framework)
- set(_FRAMEWORK_SEARCH_PATHS /Library/Frameworks/ /System/Library/Frameworks)
- if(PYTHON_ROOT)
- set(_FRAMEWORK_SEARCH_PATHS ${PYTHON_ROOT}/Library/Frameworks)
- endif()
- foreach(_PATH ${_FRAMEWORK_SEARCH_PATHS})
- set(_FULL_FRAMEWORK_NAME "${_PATH}/Python.framework")
- if(EXISTS ${_FULL_FRAMEWORK_NAME})
- set(PYTHON_FRAMEWORK ON)
- set(PYTHON_INCLUDE_PATH "${_FULL_FRAMEWORK_NAME}/Headers")
- set(PYTHON_FRAMEWORK_PATH "${_FULL_FRAMEWORK_NAME}/Python")
- endif()
- endforeach()
-endmacro()
-
-
-
-macro(_find_python PYTHON_ROOT VERSION)
- string(REPLACE "." "" _VERSION_NO_DOTS "${VERSION}")
- if(PYTHON_ROOT)
- find_library(PYTHON_LIBRARIES
- NAMES "python${_VERSION_NO_DOTS}" "python${VERSION}"
- "python${_VERSION_NO_DOTS}m" "python${VERSION}m"
- HINTS "${PYTHON_ROOT}"
- PATH_SUFFIXES lib libs
- NO_SYSTEM_ENVIRONMENT_PATH NO_DEFAULT_PATH
- )
- find_path(PYTHON_INCLUDE_PATH
- NAMES Python.h
- HINTS "${PYTHON_ROOT}/include"
- PATH_SUFFIXES include "python${_VERSION_NO_DOTS}" "python${VERSION}"
- "python${_VERSION_NO_DOTS}m" "python${VERSION}m"
- NO_SYSTEM_ENVIRONMENT_PATH NO_DEFAULT_PATH
- )
- else()
- find_library(PYTHON_LIBRARIES
- NAMES "python${_VERSION_NO_DOTS}" "python${VERSION}"
- "python${_VERSION_NO_DOTS}m" "python${VERSION}m"
- PATH_SUFFIXES lib
- )
- find_path(PYTHON_INCLUDE_PATH
- NAMES Python.h
- PATH_SUFFIXES include "python${_VERSION_NO_DOTS}" "python${VERSION}"
- "python${_VERSION_NO_DOTS}m" "python${VERSION}m"
- )
- endif()
-endmacro()
-
-macro(_find_python_bin PYTHON_ROOT VERSION)
- string(REPLACE "." "" _VERSION_NO_DOTS "${VERSION}")
- if(PYTHON_ROOT)
- find_program(PYTHON_BINARY
- NAMES "python${_VERSION_NO_DOTS}" "python${VERSION}" python.exe
- HINTS "${PYTHON_ROOT}"
- PATH_SUFFIXES bin
- NO_SYSTEM_ENVIRONMENT_PATH NO_DEFAULT_PATH
- )
- else()
- find_program(PYTHON_BINARY
- NAMES "python${_VERSION_NO_DOTS}" "python${VERSION}"
- HINTS "${CMAKE_PREFIX_PATH}"
- PATH_SUFFIXES bin
- )
- endif()
-endmacro()
-
-#-------------------------------------------------------------------------------
-# check for python lib
-#
-# this macro honours the values of PYTHON_ROOT and PYTHON_VERSION
-#-------------------------------------------------------------------------------
-macro(check_for_python_lib)
- if(PYTHON_VERSION)
- _find_python("${PYTHON_ROOT}" "${PYTHON_VERSION}")
- else()
- foreach(_VERSION ${PYTHON_VERSIONS})
- if((${PYTHON_MIN_VERSION} VERSION_LESS ${_VERSION}) OR
- (${PYTHON_MIN_VERSION} VERSION_EQUAL ${_VERSION}))
- _find_python("${PYTHON_ROOT}" "${_VERSION}")
- if(PYTHON_LIBRARIES)
- set(PYTHON_VERSION "${_VERSION}")
- break()
- endif()
- endif()
- endforeach()
- endif()
- # fallback to non-versioned naming scheme
- if (NOT $PYTHON_LIBRARIES)
- _find_python("${PYTHON_ROOT}" "")
- endif()
-endmacro()
-
-macro(check_for_python_binary)
- if(PYTHON_VERSION)
- _find_python_bin("${PYTHON_ROOT}" "${PYTHON_VERSION}")
- else()
- foreach(_VERSION ${PYTHON_VERSIONS})
- if((${PYTHON_MIN_VERSION} VERSION_LESS ${_VERSION}) OR
- (${PYTHON_MIN_VERSION} VERSION_EQUAL ${_VERSION}))
- _find_python_bin("${PYTHON_ROOT}" "${_VERSION}")
- if(PYTHON_BINARY)
- set(PYTHON_VERSION "${_VERSION}")
- # disallow all versions except for the one we just found. This makes
- # sure we don't mismatch the python binary and the libraries.
- set(PYTHON_VERSIONS "${_VERSION}")
- break()
- endif()
- endif()
- endforeach()
- endif()
- if (NOT PYTHON_BINARY)
- _find_python("${PYTHON_ROOT}" "")
- endif()
-endmacro()
-
-if(NOT PYTHON_ROOT)
- if(WIN32)
- set(PYTHON_ROOT "${CMAKE_PREFIX_PATH}")
- else()
- set(PYTHON_ROOT "/usr")
- endif()
-endif()
-if(APPLE AND NOT PYTHON_IGNORE_FRAMEWORKS)
- check_for_python_framework()
-endif()
-
-# first check for python binary.
-check_for_python_binary()
-
-if(NOT PYTHON_FRAMEWORK_FOUND)
- check_for_python_lib()
-endif()
-
-mark_as_advanced(
- PYTHON_LIBRARIES
- PYTHON_INCLUDE_PATH
- PYTHON_VERSION
- PYTHON_BINARY
-)
-
-if(PYTHON_LIBRARIES)
- if(PYTHON_FRAMEWORK)
- set(PYTHON_LIBRARIES "${PYTHON_FRAMEWORK_PATH}"
- CACHE FILEPATH "Python Libraries" FORCE)
- else()
- set(PYTHON_LIBRARIES "${PYTHON_LIBRARIES}"
- CACHE FILEPATH "Python Libraries" FORCE)
- endif()
- set(PYTHON_INCLUDE_PATH "${PYTHON_INCLUDE_PATH}"
- CACHE FILEPATH "Python Include Path" FORCE)
-endif()
-
-if (PYTHON_BINARY)
- set(PYTHON_VERSION "${PYTHON_VERSION}"
- CACHE STRING "Python Version" FORCE)
- set(PYTHON_BINARY "${PYTHON_BINARY}"
- CACHE FILEPATH "Python Binary" FORCE)
-endif()
diff --git a/cmake_support/OST.cmake b/cmake_support/OST.cmake
index 7d6ff14ef..8151713e6 100644
--- a/cmake_support/OST.cmake
+++ b/cmake_support/OST.cmake
@@ -450,11 +450,11 @@ macro(ui_to_python LIBNAME PYMODDIR STAGEDIR)
add_custom_target("${LIBNAME}_ui" ALL)
add_dependencies("_${LIBNAME}" "${LIBNAME}_ui")
find_program(_PYUIC_EXECUTABLE
- NAMES pyuic5-${PYTHON_VERSION} pyuic5 pyuic pyuic5.bat
+ NAMES pyuic5-${Python_VERSION} pyuic5 pyuic pyuic5.bat
PATHS ENV PATH
)
if(NOT _PYUIC_EXECUTABLE)
- message(FATAL_ERROR "Could not find pyuic command in " ${QT_BINARY_DIR} " for python version " ${PYTHON_VERSION})
+ message(FATAL_ERROR "Could not find pyuic command in " ${QT_BINARY_DIR} " for python version " ${Python_VERSION})
endif(NOT _PYUIC_EXECUTABLE)
set(out_files)
foreach(input_file ${_input_files})
@@ -491,7 +491,7 @@ macro(compile_py_files module out_dir compiled_files_name)
get_filename_component(_in_name ${input_file} NAME)
file(MAKE_DIRECTORY ${out_dir})
add_custom_command(TARGET ${module}
- COMMAND ${PYTHON_BINARY} -c "import py_compile;py_compile.compile(\"${_in_file}\",\"${_out_file}\",\"${_in_name}\",doraise=True)"
+ COMMAND ${Python_EXECUTABLE} -c "import py_compile;py_compile.compile(\"${_in_file}\",\"${_out_file}\",\"${_in_name}\",doraise=True)"
VERBATIM DEPENDS ${input_file}
)
endforeach()
@@ -521,15 +521,16 @@ macro(pymod)
if (ENABLE_STATIC)
return()
endif()
- if (_ARG_OUTPUT_DIR)
- set(PYMOD_DIR "python${PYTHON_VERSION}/site-packages/${_ARG_OUTPUT_DIR}")
+ if(_ARG_OUTPUT_DIR)
+ set(PYMOD_DIR "${PYTHON_MODULE_PATH}/${_ARG_OUTPUT_DIR}")
else()
- set(PYMOD_DIR "python${PYTHON_VERSION}/site-packages/${_ARG_PREFIX}/${_ARG_NAME}")
+ set(PYMOD_DIR
+ "${PYTHON_MODULE_PATH}/${_ARG_PREFIX}/${_ARG_NAME}")
endif()
set(_LIB_NAME ${_ARG_PREFIX}_${_ARG_NAME})
set(PYMOD_STAGE_DIR "${LIB_STAGE_PATH}/${PYMOD_DIR}")
file(MAKE_DIRECTORY ${PYMOD_STAGE_DIR})
- include_directories(${PYTHON_INCLUDE_PATH})
+ include_directories(${Python_INCLUDE_DIRS})
#-----------------------------------------------------------------------------
# compile and link C++ wrappers
#-----------------------------------------------------------------------------
@@ -548,7 +549,7 @@ macro(pymod)
set(_PARENT_LIB_NAME "${_PARENT_NAME}")
endif()
target_link_libraries("_${_LIB_NAME}" ${_PARENT_LIB_NAME}
- ${PYTHON_LIBRARIES} ${BOOST_PYTHON_LIBRARIES})
+ ${Python_LIBRARIES} ${BOOST_PYTHON_LIBRARIES})
set_target_properties("_${_LIB_NAME}"
PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PYMOD_STAGE_DIR})
@@ -706,9 +707,9 @@ macro(ost_unittest)
if(python_path)
set(python_path ":${python_path}")
endif(python_path)
- set(python_path "${LIB_STAGE_PATH}/python${PYTHON_VERSION}/site-packages${python_path}")
+ set(python_path "${LIB_STAGE_PATH}/${PYTHON_MODULE_PATH}${python_path}")
if(WIN32)
- set (PY_TESTS_CMD "PYTHONPATH=${python_path} ${PYTHON_BINARY}")
+ set (PY_TESTS_CMD "PYTHONPATH=${python_path} ${Python_EXECUTABLE}")
# todo fix python unit test running for Windows
#set (PY_TESTS_CMD "${EXECUTABLE_OUTPUT_PATH}/ost.bat")
#add_custom_target("${py_test}_run"
@@ -719,7 +720,7 @@ macro(ost_unittest)
#add_dependencies("${py_test}_run" ost_scripts "_${_ARG_PREFIX}_${_ARG_MODULE}")
#add_dependencies(check "${py_test}_run")
else()
- set (PY_TESTS_CMD "PYTHONPATH=${python_path} ${PYTHON_BINARY}")
+ set (PY_TESTS_CMD "PYTHONPATH=${python_path} ${Python_EXECUTABLE}")
add_custom_target("${py_test}_run"
sh -c "${PY_TESTS_CMD} ${CMAKE_CURRENT_SOURCE_DIR}/${py_test}"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
@@ -748,8 +749,8 @@ endmacro()
#-------------------------------------------------------------------------------
macro(ost_find_python_module MODULE)
if (NOT PYTHON_MODULE_${MODULE})
- message(STATUS "Searching for python module ${MODULE} for ${PYTHON_BINARY}")
- execute_process(COMMAND ${PYTHON_BINARY} -c "import ${MODULE}"
+ message(STATUS "Searching for python module ${MODULE} for ${Python_EXECUTABLE}")
+ execute_process(COMMAND ${Python_EXECUTABLE} -c "import ${MODULE}"
OUTPUT_QUIET ERROR_QUIET
RESULT_VARIABLE _IMPORT_ERROR)
if (_IMPORT_ERROR)
@@ -770,8 +771,8 @@ macro(ost_find_python_module_alt MODULES)
foreach(py_mod ${MODULES})
if (NOT PYTHON_MODULE_${py_mod})
set(_PY_MODS "${_PY_MODS} ${py_mod}")
- message(STATUS "Searching for python module ${py_mod} for ${PYTHON_BINARY}")
- execute_process(COMMAND ${PYTHON_BINARY} -c "import ${py_mod}"
+ message(STATUS "Searching for python module ${py_mod} for ${Python_EXECUTABLE}")
+ execute_process(COMMAND ${Python_EXECUTABLE} -c "import ${py_mod}"
OUTPUT_QUIET ERROR_QUIET
RESULT_VARIABLE _IMPORT_ERROR)
if (NOT _IMPORT_ERROR)
@@ -812,7 +813,7 @@ macro(ost_match_boost_python_version)
list(GET _BOOST_PYTHON_LIBRARY ${_LIB_INDEX} _BP_LIB_PATH)
set(_BOOST_PYTHON_LIBRARY ${_BP_LIB_PATH})
endif()
- set(CMAKE_REQUIRED_FLAGS "-I${PYTHON_INCLUDE_PATH} -I${Boost_INCLUDE_DIR} ${PYTHON_LIBRARIES} ${_BOOST_PYTHON_LIBRARY}")
+ set(CMAKE_REQUIRED_FLAGS "-I${Python_INCLUDE_DIRS} -I${Boost_INCLUDE_DIR} ${Python_LIBRARIES} ${_BOOST_PYTHON_LIBRARY}")
check_cxx_source_runs(
"#include <boost/python.hpp>
@@ -941,15 +942,14 @@ endmacro()
set(_BOOST_MIN_VERSION 1.31)
macro(setup_boost)
- set (Boost_NO_BOOST_CMAKE TRUE)
# starting with CMake 3.11 we could use the following instead of the foreach
# find_package(Boost ${_BOOST_MIN_VERSION} COMPONENTS
- # python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR} REQUIRED)
+ # python${Python_VERSION_MAJOR}${Python_VERSION_MINOR} REQUIRED)
# set(BOOST_PYTHON_LIBRARIES ${Boost_LIBRARIES})
# see https://cmake.org/cmake/help/v3.11/module/FindBoost.html
- foreach(_python_lib_name python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}
- python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}
- python${PYTHON_VERSION_MAJOR}
+ foreach(_python_lib_name python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}
+ python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}
+ python${Python_VERSION_MAJOR}
python)
find_package(Boost ${_BOOST_MIN_VERSION} COMPONENTS ${_python_lib_name} QUIET)
if(Boost_FOUND)
diff --git a/deployment/linux/CMakeLists.txt b/deployment/linux/CMakeLists.txt
index 01d8c2373..96757cc9b 100644
--- a/deployment/linux/CMakeLists.txt
+++ b/deployment/linux/CMakeLists.txt
@@ -42,7 +42,7 @@ elseif(CPACK_GENERATOR MATCHES "TGZ")
\"\${CMAKE_INSTALL_PREFIX}/bin/molck\"
\"\${CMAKE_INSTALL_PREFIX}/${LIBEXEC_PATH}/gosty\")
- copy_python(${PYTHON_INCLUDE_PATH} ${PYTHON_VERSION} new_python_binary)
+ copy_python(${Python_INCLUDE_DIRS} ${Python_VERSION} new_python_binary)
list(APPEND OST_BINARIES \${new_python_binary})
file(GLOB_RECURSE OST_PYMODS \"\${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/*.so\")
diff --git a/deployment/macos/CMakeLists.txt b/deployment/macos/CMakeLists.txt
index e2e9bc675..7f0b01562 100644
--- a/deployment/macos/CMakeLists.txt
+++ b/deployment/macos/CMakeLists.txt
@@ -24,10 +24,10 @@ install(CODE "
\"\${CMAKE_INSTALL_PREFIX}/libexec/openstructure/gosty\")
#copy python into bundle if a version different from the system version is used
- if(NOT ${PYTHON_BINARY} MATCHES /usr/bin/)
- copy_python(${PYTHON_INCLUDE_PATH} ${PYTHON_VERSION} new_python_binary)
+ if(NOT ${Python_EXECUTABLE} MATCHES /usr/bin/)
+ copy_python(${Python_INCLUDE_DIRS} ${Python_VERSION} new_python_binary)
list(APPEND OST_BINARIES \${new_python_binary})
- endif(NOT ${PYTHON_BINARY} MATCHES /usr/bin/)
+ endif(NOT ${Python_EXECUTABLE} MATCHES /usr/bin/)
file(GLOB_RECURSE OST_PYMODS \"\${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/*.so\")
list(APPEND OST_BINARIES \${OST_PYMODS})
diff --git a/modules/base/pymod/CMakeLists.txt b/modules/base/pymod/CMakeLists.txt
index e09ed4431..77f8ae1d4 100644
--- a/modules/base/pymod/CMakeLists.txt
+++ b/modules/base/pymod/CMakeLists.txt
@@ -34,5 +34,5 @@ if(NOT ENABLE_STATIC)
INPUT __init__.py.in
SUBSTITUTE "${SUBST_DICT}"
TARGET ost_base_pymod
- OUTPUT_DIR "${LIB_DIR}/python${PYTHON_VERSION}/site-packages/ost")
+ OUTPUT_DIR "${LIB_DIR}/${PYTHON_MODULE_PATH}/ost")
endif()
diff --git a/modules/doc/install.rst b/modules/doc/install.rst
index b4382b7c9..d4970bf4a 100644
--- a/modules/doc/install.rst
+++ b/modules/doc/install.rst
@@ -147,7 +147,7 @@ can influence it.
reason, it is desirable to use the non-multithreaded boost libraries, you can
switch `Boost_USE_MULTITHREADED` off (it is on by default).
-* `PYTHON_ROOT` is the Python equivalent of BOOST_ROOT. It should be set to
+* `Python_ROOT_DIR` is the Python equivalent of BOOST_ROOT. It should be set to
the prefix path containing the python binary, headers and libraries.
* `SYS_ROOT` controls the general prefix for searching libraries and headers.
@@ -199,9 +199,9 @@ can influence it.
* Several paths to other libraries can be set if they are not in the expected
locations:
- * `PYTHON_LIBRARIES` defines the location of the Python library (file name
+ * `Python_LIBRARY` defines the location of the Python library (file name
starting with `libpython`). This must be set if it is not in
- `$PYTHON_ROOT/lib`.
+ `$Python_ROOT_DIR/lib`.
* `EIGEN3_INCLUDE_DIR` defines the include folder of Eigen3 (contains `Eigen`
folder with include files).
* `FFTW_LIBRARY` defines the location of the FFTW3 library (file name starting
@@ -318,18 +318,15 @@ All the dependencies can be installed from the package manager as follows:
qt5-qmake qtbase5-dev libpng-dev libsqlite3-dev
Now, all dependencies are located in standard locations and cmake will
-automatically find them without the need to pass any additional parameters. The
-only exception is the Python library which is put in a different path than
-expected. Also, we add -DOPTIMIZE, which will tell cmake to build an optimised
-version of OpenStructure.
+automatically find them without the need to pass any additional parameters.
+We add -DOPTIMIZE, which will tell cmake to build an optimised version of
+OpenStructure.
.. code-block:: bash
- cmake . -DPYTHON_LIBRARIES=/usr/lib/x86_64-linux-gnu/libpython3.8.so \
- -DOPTIMIZE=ON
+ cmake . -DOPTIMIZE=ON
+
-Be careful at -DPYTHON_LIBRARIES, Debian 10 comes with Python 3.7 so that needs
-to be substituted (libpython3.8.so -> libpython3.7m.so).
**macOS (Catalina) with Homebrew**
@@ -376,11 +373,11 @@ C flags:
.. code-block:: bash
- cmake . -DPYTHON_INCLUDE_PATH=/usr/local/opt/python@3.8/Frameworks/\
+ cmake . -DPython_INCLUDE_DIR=/usr/local/opt/python@3.8/Frameworks/\
Python.framework/Versions/Current/include/python3.8/ \
- -DPYTHON_LIBRARIES=/usr/local/opt/python@3.8/Frameworks/\
+ -DPython_LIBRARY=/usr/local/opt/python@3.8/Frameworks/\
Python.framework/Versions/Current/lib/libpython3.8.dylib \
- -DPYTHON_ROOT=/usr/local/opt/python@3.8/ \
+ -DPython_ROOT_DIR=/usr/local/opt/python@3.8/ \
-DBOOST_ROOT=/usr/local \
-DSYS_ROOT=/usr/local \
-DOPTIMIZE=ON \
diff --git a/modules/gui/src/CMakeLists.txt b/modules/gui/src/CMakeLists.txt
index a23a530d6..f9db89d69 100644
--- a/modules/gui/src/CMakeLists.txt
+++ b/modules/gui/src/CMakeLists.txt
@@ -459,7 +459,7 @@ module(NAME gui SOURCES ${OST_GUI_MOCS} ${OST_GUI_SOURCES}
${OST_GUI_HEADERS}
DEPENDS_ON ost_gfx ost_io ost_mol_alg ost_seq_alg
LINK ${QT_LIBRARIES}
- ${PYTHON_LIBRARIES}
+ ${Python_LIBRARIES}
${BOOST_PYTHON_LIBRARIES}
${SPNAV_LIBRARIES}
NO_STATIC)
@@ -470,7 +470,7 @@ if (ADDITIONAL_LIBRARIES)
target_link_libraries(ost_gui "${ADDITIONAL_LIBRARIES}")
endif()
-include_directories(${PYTHON_INCLUDE_PATH})
+include_directories(${Python_INCLUDE_DIRS})
qt5_add_resources(OST_QT_RESOURCE dngr.qrc)
qt5_wrap_cpp(OST_GOSTY_MOC "gosty.hh"
OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index f78649937..9fe3e1449 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -1,5 +1,6 @@
-set(SUBST_DICT BUILD_TYPE=${CMAKE_BUILD_TYPE} PYTHON_BINARY=${PYTHON_BINARY}
-PYTHON_VERSION=${PYTHON_VERSION} LIBDIR=${LIB_DIR} LIBEXEC_PATH=${LIBEXEC_PATH})
+set(SUBST_DICT BUILD_TYPE=${CMAKE_BUILD_TYPE} Python_EXECUTABLE=${Python_EXECUTABLE}
+Python_VERSION=${Python_VERSION} LIBDIR=${LIB_DIR} LIBEXEC_PATH=${LIBEXEC_PATH}
+PYTHON_MODULE_PATH=${PYTHON_MODULE_PATH})
message("${BUILD_TYPE}")
add_custom_target(ost_scripts ALL)
@@ -30,11 +31,11 @@ if (NOT ENABLE_STATIC)
endif()
script(NAME ost_startup.py INPUT ost_startup.py.in SUBSTITUTE ${SUBST_DICT}
- TARGET ost_scripts OUTPUT_DIR "${LIB_DIR}/python${PYTHON_VERSION}/site-packages/ost" )
+ TARGET ost_scripts OUTPUT_DIR "${LIB_DIR}/${PYTHON_MODULE_PATH}/ost" )
set(INIT_SCRIPTS
)
- set(SPD "${LIB_DIR}/python${PYTHON_VERSION}/site-packages/ost")
+ set(SPD "${LIB_DIR}/${PYTHON_MODULE_PATH}/ost")
if (ENABLE_GUI)
list(APPEND INIT_SCRIPTS dng_startup.py)
endif()
diff --git a/scripts/ost-nightly-build.sh b/scripts/ost-nightly-build.sh
index 6f6cbddfe..653b9142a 100644
--- a/scripts/ost-nightly-build.sh
+++ b/scripts/ost-nightly-build.sh
@@ -138,7 +138,7 @@ configopts = " -DOPTIMIZE=1 -DCOMPILE_TMTOOLS=1 -DENABLE_GFX=OFF -DENABLE_GUI=OF
configopts += " -DCOMPOUND_LIB=/scicore/home/schwede/GROUP/OpenStructure/ChemLib/1.6/compounds.chemlib"
-configopts += " -DPYTHON_ROOT=\$EBROOTPYTHON -DEIGEN3_INCLUDE_DIR=\$EBROOTEIGEN -DFFTW_LIBRARY=\$EBROOTFFTW/lib/libfftw3f.a -DFFTW_INCLUDE_DIR=\$EBROOTFFTW/include -DBOOST_ROOT=\$EBROOTBOOST -DQT_QMAKE_EXECUTABLE=\$EBROOTQT/bin/qmake -DBoost_USE_MULTITHREADED=OFF"
+configopts += " -DPython_ROOT_DIR=\$EBROOTPYTHON -DEIGEN3_INCLUDE_DIR=\$EBROOTEIGEN -DFFTW_LIBRARY=\$EBROOTFFTW/lib/libfftw3f.a -DFFTW_INCLUDE_DIR=\$EBROOTFFTW/include -DBOOST_ROOT=\$EBROOTBOOST -DQT_QMAKE_EXECUTABLE=\$EBROOTQT/bin/qmake -DBoost_USE_MULTITHREADED=OFF"
configopts += " -DENABLE_MM=1 -DOPEN_MM_LIBRARY=\$EBROOTOPENMM/lib/libOpenMM.so -DOPEN_MM_PLUGIN_DIR=\$EBROOTOPENMM/lib/plugins -DOPEN_MM_INCLUDE_DIR=\$EBROOTOPENMM/include"
diff --git a/scripts/ost.in b/scripts/ost.in
index ee1f600a6..b85886a39 100755
--- a/scripts/ost.in
+++ b/scripts/ost.in
@@ -47,7 +47,7 @@ if test -e "${OST_SCRIPT}" ; then
fi
done
IFS="#"
- $pyexec -c "exec(open('$DNG_ROOT/@LIBDIR@/python@PYTHON_VERSION@/site-packages/ost/ost_startup.py').read())" "${OST_SCRIPT}" $opts
+ $pyexec -c "exec(open('$DNG_ROOT/@LIBDIR@/@PYTHON_MODULE_PATH@/ost/ost_startup.py').read())" "${OST_SCRIPT}" $opts
RC=$?
else
opts=""
@@ -59,7 +59,7 @@ else
fi
done
IFS="#"
- $pyexec $interactive -c "exec(open('$DNG_ROOT/@LIBDIR@/python@PYTHON_VERSION@/site-packages/ost/ost_startup.py').read())" $opts
+ $pyexec $interactive -c "exec(open('$DNG_ROOT/@LIBDIR@/@PYTHON_MODULE_PATH@/ost/ost_startup.py').read())" $opts
RC=$?
fi
IFS=$OLDIFS
diff --git a/scripts/ost_config.in b/scripts/ost_config.in
index b3e253c5c..d0ba65da0 100644
--- a/scripts/ost_config.in
+++ b/scripts/ost_config.in
@@ -24,7 +24,7 @@
export DNG_ROOT=`cd "$BIN_DIR/..";pwd`
export DNG_BINDIR="$DNG_ROOT/bin"
export DNG_LIBDIR="$DNG_ROOT/@LIBDIR@"
-export DNG_INITDIR="$DNG_LIBDIR/python@PYTHON_VERSION@/site-packages/ost/"
+export DNG_INITDIR="$DNG_LIBDIR/@PYTHON_MODULE_PATH@/ost/"
export PATH="$DNG_BINDIR:${PATH}"
export DYLD_FRAMEWORK_PATH="$DNG_LIBDIR:${DYLD_FRAMEWORK_PATH}"
@@ -37,7 +37,7 @@ export LD_LIBRARY_PATH="$DNG_LIBDIR:${LD_LIBRARY_PATH}"
# retrieve absolute path to python executable
-pyexec="@PYTHON_BINARY@"
+pyexec="@Python_EXECUTABLE@"
if [ ! -x "$pyexec" ]; then
echo "Error: Python executable '$pyexec' not found!"
--
GitLab