From f40dc411c98d41166de7316778c4e0b3a7f9f298 Mon Sep 17 00:00:00 2001 From: Ritchie Swann Date: Thu, 16 May 2024 13:21:14 +0100 Subject: [PATCH 1/4] Rewritten build procedure to use cmake Removed autoconf-dependent files, rewritten with cmake scripts --- .gitignore | 24 +- CMakeLists.txt | 101 +++ INSTALL | 28 +- Makefile.am | 2 - bootstrap | 6 - m4/boost.m4 | 1808 ---------------------------------------------- src/Makefile.am | 13 - src/Makefile.old | 79 -- 8 files changed, 117 insertions(+), 1944 deletions(-) create mode 100644 CMakeLists.txt delete mode 100644 Makefile.am delete mode 100755 bootstrap delete mode 100644 m4/boost.m4 delete mode 100644 src/Makefile.am delete mode 100644 src/Makefile.old diff --git a/.gitignore b/.gitignore index 4008443..b6df0b4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1,3 @@ +.github .vscode -*.o -*.Po -depcomp -ltmain.sh -traces.* -clearbounds -cleartiles -gentiles -.dirstamp -Makefile -libtool -install-sh -config.* -configure -compile -aclocal.m4 -missing -output.* -requests -*.m4 -Makefile.in -warp-sabre +build diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..b6062dc --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,101 @@ +cmake_minimum_required(VERSION 3.29) +project(warp-sabre LANGUAGES CXX) + +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED True) + +find_package(ImageMagick REQUIRED COMPONENTS Magick++) +include_directories(${ImageMagick_INCLUDE_DIRS}) +add_compile_options(${ImageMagick_COMPILE_OPTIONS}) + +find_package(Boost REQUIRED COMPONENTS program_options filesystem system thread) + +add_executable(warp-sabre + src/ImageWarpByFunc.cpp + src/ImgMagick.cpp + src/ReadDelimitedFile.cpp + src/StringUtils.cpp + src/Tile.cpp + src/TransformPoly.cpp + src/WarpOs.cpp + src/WriteKml.cpp + src/ganzc/LatLong-OSGBconversion.cpp + src/gbos1936/Gbos1936.cpp +) + +add_executable(gentiles + src/CopyPixels.cpp + src/GenTiles.cpp + src/GetBounds.cpp + src/ImageWarpByFunc.cpp + src/ImgMagick.cpp + src/ReadDelimitedFile.cpp + src/ReadKmlFile.cpp + src/StringUtils.cpp + src/Tile.cpp + src/gbos1936/Gbos1936.cpp +) + +add_executable(cleartiles + src/ClearTiles.cpp + src/GetBounds.cpp + src/ImageWarpByFunc.cpp + src/ImgMagick.cpp + src/ReadDelimitedFile.cpp + src/ReadKmlFile.cpp + src/StringUtils.cpp + src/Tile.cpp + src/gbos1936/Gbos1936.cpp +) + +add_executable(clearbounds + src/ClearBounds.cpp + src/CopyPixels.cpp + src/GetBounds.cpp + src/ImageWarpByFunc.cpp + src/ImgMagick.cpp + src/ReadDelimitedFile.cpp + src/ReadKmlFile.cpp + src/StringUtils.cpp + src/Tile.cpp + src/gbos1936/Gbos1936.cpp +) + +target_link_libraries(warp-sabre + PRIVATE ${ImageMagick_LIBRARIES} + PRIVATE -lboost_program_options-mt + PRIVATE -lboost_system-mt + PRIVATE -lboost_filesystem-mt + PRIVATE -lmorph + PRIVATE -lnewmat +) + +target_link_libraries(gentiles + PRIVATE ${ImageMagick_LIBRARIES} + PRIVATE xml2 + PRIVATE -lboost_program_options-mt + PRIVATE -lboost_thread-mt + PRIVATE -lboost_filesystem-mt + PRIVATE -lboost_system-mt + PRIVATE -lmorph +) + +target_link_libraries(cleartiles + PRIVATE ${ImageMagick_LIBRARIES} + PRIVATE xml2 + PRIVATE -lboost_program_options-mt + PRIVATE -lboost_thread-mt + PRIVATE -lboost_filesystem-mt + PRIVATE -lboost_system-mt + PRIVATE -lmorph +) + +target_link_libraries(clearbounds + PRIVATE ${ImageMagick_LIBRARIES} + PRIVATE xml2 + PRIVATE -lboost_program_options-mt + PRIVATE -lboost_thread-mt + PRIVATE -lboost_filesystem-mt + PRIVATE -lboost_system-mt + PRIVATE -lmorph +) \ No newline at end of file diff --git a/INSTALL b/INSTALL index f842034..6782688 100644 --- a/INSTALL +++ b/INSTALL @@ -11,24 +11,24 @@ For Debian Linux, you should be able to run : sudo apt-get install libboost-dev libmorph-dev libmagickwand-dev g++ libxml-dev libnewmat10-dev To build, type: -./bootstrap -./configure +mkdir build +cd build +cmake .. make sudo make install ==macOS== -For macOS using homebrew, a little more work is required -brew install llvm imagemagick boost xquartz - llvm is required because the stock macOS clang does not support - -fopenmp which is required by the ImageMagick C++ API +For macOS using homebrew: +brew install magick++ boost xquartz Newmat and Xmorph must be installed manually into the homebrew directories eg: /usr/local/lib for X86_64, /opt/homebrew/lib for arm64 -Before calling configure, set the following environemnt variables to point -to homebrew. For arm64 macOS, these are: -CXX=/opt/homebrew/opt/llvm/bin/clang++ -CXXFLAGS=-I/opt/homebrew/include -LDFLAGS=-L/opt/homebrew/lib -L/opt/homebrew/opt/llvm/lib -L/opt/homebrew/opt/libomp/lib -BOOST_ROOT=/opt/homebrew/include -MAGICKWAND_CFLAGS=`Magick++-config --cppflags` -MAGICKWAND_LIBS=`Magick++-config --libs` +To build, type: +mkdir build +cd build + +(for x64) cmake -DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES=/usr/local/include -DCMAKE_CXX_STANDARD_LIBRARIES=-L/usr/local/lib +(for arm64) cmake -DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES=/opt/homebrew/include -DCMAKE_CXX_STANDARD_LIBRARIES=-L/opt/homebrew/lib + +make +sudo make install diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 0182df2..0000000 --- a/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -SUBDIRS = src -ACLOCAL_AMFLAGS = -I m4 diff --git a/bootstrap b/bootstrap deleted file mode 100755 index e8e55eb..0000000 --- a/bootstrap +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -e - -aclocal -libtoolize -automake --add-missing -autoconf diff --git a/m4/boost.m4 b/m4/boost.m4 deleted file mode 100644 index 6f1738b..0000000 --- a/m4/boost.m4 +++ /dev/null @@ -1,1808 +0,0 @@ -# boost.m4: Locate Boost headers and libraries for autoconf-based projects. -# Copyright (C) 2007-2011, 2014 Benoit Sigoure -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Additional permission under section 7 of the GNU General Public -# License, version 3 ("GPLv3"): -# -# If you convey this file as part of a work that contains a -# configuration script generated by Autoconf, you may do so under -# terms of your choice. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -m4_define([_BOOST_SERIAL], [m4_translit([ -# serial 32 -], [# -], [])]) - -# Original sources can be found at http://github.com/tsuna/boost.m4 -# You can fetch the latest version of the script by doing: -# wget http://github.com/tsuna/boost.m4/raw/master/build-aux/boost.m4 - -# ------ # -# README # -# ------ # - -# This file provides several macros to use the various Boost libraries. -# The first macro is BOOST_REQUIRE. It will simply check if it's possible to -# find the Boost headers of a given (optional) minimum version and it will -# define BOOST_CPPFLAGS accordingly. It will add an option --with-boost to -# your configure so that users can specify non standard locations. -# If the user's environment contains BOOST_ROOT and --with-boost was not -# specified, --with-boost=$BOOST_ROOT is implicitly used. -# For more README and documentation, go to http://github.com/tsuna/boost.m4 -# Note: THESE MACROS ASSUME THAT YOU USE LIBTOOL. If you don't, don't worry, -# simply read the README, it will show you what to do step by step. - -m4_pattern_forbid([^_?(BOOST|Boost)_]) - - -# _BOOST_SED_CPP(SED-PROGRAM, PROGRAM, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -------------------------------------------------------- -# Same as AC_EGREP_CPP, but leave the result in conftest.i. -# -# SED-PROGRAM is *not* overquoted, as in AC_EGREP_CPP. It is expanded -# in double-quotes, so escape your double quotes. -# -# It could be useful to turn this into a macro which extracts the -# value of any macro. -m4_define([_BOOST_SED_CPP], -[AC_LANG_PUSH([C++])dnl -AC_LANG_PREPROC_REQUIRE()dnl -AC_REQUIRE([AC_PROG_SED])dnl -AC_LANG_CONFTEST([AC_LANG_SOURCE([[$2]])]) -AS_IF([dnl eval is necessary to expand ac_cpp. -dnl Ultrix and Pyramid sh refuse to redirect output of eval, so use subshell. -dnl Beware of Windows end-of-lines, for instance if we are running -dnl some Windows programs under Wine. In that case, boost/version.hpp -dnl is certainly using "\r\n", but the regular Unix shell will only -dnl strip `\n' with backquotes, not the `\r'. This results in -dnl boost_cv_lib_version='1_37\r' for instance, which breaks -dnl everything else. -dnl Cannot use 'dnl' after [$4] because a trailing dnl may break AC_CACHE_CHECK -dnl -dnl Beware that GCC 5, when expanding macros, may embed # line directives -dnl a within single line: -dnl -dnl # 1 "conftest.cc" -dnl # 1 "" -dnl # 1 "" -dnl # 1 "conftest.cc" -dnl # 1 "/opt/local/include/boost/version.hpp" 1 3 -dnl # 2 "conftest.cc" 2 -dnl boost-lib-version = -dnl # 2 "conftest.cc" 3 -dnl "1_56" -dnl -dnl So get rid of the # and empty lines, and glue the remaining ones together. -(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | - grep -v '#' | - grep -v '^[[[:space:]]]*$' | - tr -d '\r' | - tr -s '\n' ' ' | - $SED -n -e "$1" >conftest.i 2>&1], - [$3], - [$4]) -rm -rf conftest* -AC_LANG_POP([C++])dnl -])# _BOOST_SED_CPP - - - -# BOOST_REQUIRE([VERSION], [ACTION-IF-NOT-FOUND]) -# ----------------------------------------------- -# Look for Boost. If version is given, it must either be a literal of the form -# "X.Y.Z" where X, Y and Z are integers (the ".Z" part being optional) or a -# variable "$var". -# Defines the value BOOST_CPPFLAGS. This macro only checks for headers with -# the required version, it does not check for any of the Boost libraries. -# On # success, defines HAVE_BOOST. On failure, calls the optional -# ACTION-IF-NOT-FOUND action if one was supplied. -# Otherwise aborts with an error message. -AC_DEFUN_ONCE([BOOST_REQUIRE], -[AC_REQUIRE([AC_PROG_CXX])dnl -AC_REQUIRE([AC_PROG_GREP])dnl -echo "$as_me: this is boost.m4[]_BOOST_SERIAL" >&AS_MESSAGE_LOG_FD -boost_save_IFS=$IFS -boost_version_req=$1 -IFS=. -set x $boost_version_req 0 0 0 -IFS=$boost_save_IFS -shift -boost_version_req=`expr "$[1]" '*' 100000 + "$[2]" '*' 100 + "$[3]"` -boost_version_req_string=$[1].$[2].$[3] -AC_ARG_WITH([boost], - [AS_HELP_STRING([--with-boost=DIR], - [prefix of Boost $1 @<:@guess@:>@])])dnl -AC_ARG_VAR([BOOST_ROOT],[Location of Boost installation])dnl -# If BOOST_ROOT is set and the user has not provided a value to -# --with-boost, then treat BOOST_ROOT as if it the user supplied it. -if test x"$BOOST_ROOT" != x; then - if test x"$with_boost" = x; then - AC_MSG_NOTICE([Detected BOOST_ROOT; continuing with --with-boost=$BOOST_ROOT]) - with_boost=$BOOST_ROOT - else - AC_MSG_NOTICE([Detected BOOST_ROOT=$BOOST_ROOT, but overridden by --with-boost=$with_boost]) - fi -fi -AC_SUBST([DISTCHECK_CONFIGURE_FLAGS], - ["$DISTCHECK_CONFIGURE_FLAGS '--with-boost=$with_boost'"])dnl -boost_save_CPPFLAGS=$CPPFLAGS - AC_CACHE_CHECK([for Boost headers version >= $boost_version_req_string], - [boost_cv_inc_path], - [boost_cv_inc_path=no -AC_LANG_PUSH([C++])dnl -m4_pattern_allow([^BOOST_VERSION$])dnl - AC_LANG_CONFTEST([AC_LANG_PROGRAM([[#include -#if !defined BOOST_VERSION -# error BOOST_VERSION is not defined -#elif BOOST_VERSION < $boost_version_req -# error Boost headers version < $boost_version_req -#endif -]])]) - # If the user provided a value to --with-boost, use it and only it. - case $with_boost in #( - ''|yes) set x '' /opt/local/include /usr/local/include /opt/include \ - /usr/include C:/Boost/include;; #( - *) set x "$with_boost/include" "$with_boost";; - esac - shift - for boost_dir - do - # Without --layout=system, Boost (or at least some versions) installs - # itself in /include/boost-. This inner loop helps to - # find headers in such directories. - # - # Any ${boost_dir}/boost-x_xx directories are searched in reverse version - # order followed by ${boost_dir}. The final '.' is a sentinel for - # searching $boost_dir" itself. Entries are whitespace separated. - # - # I didn't indent this loop on purpose (to avoid over-indented code) - boost_layout_system_search_list=`cd "$boost_dir" 2>/dev/null \ - && ls -1 | "${GREP}" '^boost-' | sort -rn -t- -k2 \ - && echo .` - for boost_inc in $boost_layout_system_search_list - do - if test x"$boost_inc" != x.; then - boost_inc="$boost_dir/$boost_inc" - else - boost_inc="$boost_dir" # Uses sentinel in boost_layout_system_search_list - fi - if test x"$boost_inc" != x; then - # We are going to check whether the version of Boost installed - # in $boost_inc is usable by running a compilation that - # #includes it. But if we pass a -I/some/path in which Boost - # is not installed, the compiler will just skip this -I and - # use other locations (either from CPPFLAGS, or from its list - # of system include directories). As a result we would use - # header installed on the machine instead of the /some/path - # specified by the user. So in that precise case (trying - # $boost_inc), make sure the version.hpp exists. - # - # Use test -e as there can be symlinks. - test -e "$boost_inc/boost/version.hpp" || continue - CPPFLAGS="$CPPFLAGS -I$boost_inc" - fi - AC_COMPILE_IFELSE([], [boost_cv_inc_path=yes], [boost_cv_version=no]) - if test x"$boost_cv_inc_path" = xyes; then - if test x"$boost_inc" != x; then - boost_cv_inc_path=$boost_inc - fi - break 2 - fi - done - done -AC_LANG_POP([C++])dnl - ]) - case $boost_cv_inc_path in #( - no) - boost_errmsg="cannot find Boost headers version >= $boost_version_req_string" - m4_if([$2], [], [AC_MSG_ERROR([$boost_errmsg])], - [AC_MSG_NOTICE([$boost_errmsg])]) - $2 - ;;#( - yes) - BOOST_CPPFLAGS= - ;;#( - *) - AC_SUBST([BOOST_CPPFLAGS], ["-I$boost_cv_inc_path"])dnl - ;; - esac - if test x"$boost_cv_inc_path" != xno; then - AC_DEFINE([HAVE_BOOST], [1], - [Defined if the requested minimum BOOST version is satisfied]) - AC_CACHE_CHECK([for Boost's header version], - [boost_cv_lib_version], - [m4_pattern_allow([^BOOST_LIB_VERSION$])dnl - _BOOST_SED_CPP([[/^boost-lib-version = /{s///;s/[\" ]//g;p;q;}]], - [#include -boost-lib-version = BOOST_LIB_VERSION], - [boost_cv_lib_version=`cat conftest.i`])]) - # e.g. "134" for 1_34_1 or "135" for 1_35 - boost_major_version=`echo "$boost_cv_lib_version" | sed 's/_//;s/_.*//'` - case $boost_major_version in #( - '' | *[[!0-9]]*) - AC_MSG_ERROR([invalid value: boost_major_version='$boost_major_version']) - ;; - esac -fi -CPPFLAGS=$boost_save_CPPFLAGS -])# BOOST_REQUIRE - - -# BOOST_STATIC() -# -------------- -# Add the "--enable-static-boost" configure argument. If this argument is given -# on the command line, static versions of the libraries will be looked up. -AC_DEFUN([BOOST_STATIC], - [AC_ARG_ENABLE([static-boost], - [AS_HELP_STRING([--enable-static-boost], - [Prefer the static boost libraries over the shared ones [no]])], - [enable_static_boost=yes], - [enable_static_boost=no])])# BOOST_STATIC - - -# BOOST_FIND_HEADER([HEADER-NAME], [ACTION-IF-NOT-FOUND], [ACTION-IF-FOUND]) -# -------------------------------------------------------------------------- -# Wrapper around AC_CHECK_HEADER for Boost headers. Useful to check for -# some parts of the Boost library which are only made of headers and don't -# require linking (such as Boost.Foreach). -# -# Default ACTION-IF-NOT-FOUND: Fail with a fatal error unless Boost couldn't be -# found in the first place, in which case by default a notice is issued to the -# user. Presumably if we haven't died already it's because it's OK to not have -# Boost, which is why only a notice is issued instead of a hard error. -# -# Default ACTION-IF-FOUND: define the preprocessor symbol HAVE_ in -# case of success # (where HEADER-NAME is written LIKE_THIS, e.g., -# HAVE_BOOST_FOREACH_HPP). -AC_DEFUN([BOOST_FIND_HEADER], -[AC_REQUIRE([BOOST_REQUIRE])dnl -if test x"$boost_cv_inc_path" = xno; then - m4_default([$2], [AC_MSG_NOTICE([Boost not available, not searching for $1])]) -else -AC_LANG_PUSH([C++])dnl -boost_save_CPPFLAGS=$CPPFLAGS -CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" -AC_CHECK_HEADER([$1], - [m4_default([$3], [AC_DEFINE(AS_TR_CPP([HAVE_$1]), [1], - [Define to 1 if you have <$1>])])], - [m4_default([$2], [AC_MSG_ERROR([cannot find $1])])]) -CPPFLAGS=$boost_save_CPPFLAGS -AC_LANG_POP([C++])dnl -fi -])# BOOST_FIND_HEADER - - -# BOOST_FIND_LIBS([COMPONENT-NAME], [CANDIDATE-LIB-NAMES], -# [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST], -# [CXX-PROLOGUE], [CXX-POST-INCLUDE-PROLOGUE], -# [ERROR_ON_UNUSABLE]) -# -------------------------------------------------------------- -# Look for the Boost library COMPONENT-NAME (e.g., `thread', for -# libboost_thread) under the possible CANDIDATE-LIB-NAMES (e.g., -# "thread_win32 thread"). Check that HEADER-NAME works and check that -# libboost_LIB-NAME can link with the code CXX-TEST. The optional -# argument CXX-PROLOGUE can be used to include some C++ code before -# the `main' function. The CXX-POST-INCLUDE-PROLOGUE can be used to -# include some code before the `main' function, but after the -# `#include '. -# -# Invokes BOOST_FIND_HEADER([HEADER-NAME]) (see above). -# -# Boost libraries typically come compiled with several flavors (with different -# runtime options) so PREFERRED-RT-OPT is the preferred suffix. A suffix is one -# or more of the following letters: sgdpn (in that order). s = static -# runtime, d = debug build, g = debug/diagnostic runtime, p = STLPort build, -# n = (unsure) STLPort build without iostreams from STLPort (it looks like `n' -# must always be used along with `p'). Additionally, PREFERRED-RT-OPT can -# start with `mt-' to indicate that there is a preference for multi-thread -# builds. Some sample values for PREFERRED-RT-OPT: (nothing), mt, d, mt-d, gdp -# ... If you want to make sure you have a specific version of Boost -# (eg, >= 1.33) you *must* invoke BOOST_REQUIRE before this macro. -# -# ERROR_ON_UNUSABLE can be set to "no" if the caller does not want their -# configure to fail -AC_DEFUN([BOOST_FIND_LIBS], -[AC_REQUIRE([BOOST_REQUIRE])dnl -AC_REQUIRE([_BOOST_FIND_COMPILER_TAG])dnl -AC_REQUIRE([BOOST_STATIC])dnl -AC_REQUIRE([_BOOST_GUESS_WHETHER_TO_USE_MT])dnl -if test x"$boost_cv_inc_path" = xno; then - AC_MSG_NOTICE([Boost not available, not searching for the Boost $1 library]) -else -dnl The else branch is huge and wasn't indented on purpose. -AC_LANG_PUSH([C++])dnl -AS_VAR_PUSHDEF([Boost_lib], [boost_cv_lib_$1])dnl -AS_VAR_PUSHDEF([Boost_lib_LDFLAGS], [boost_cv_lib_$1_LDFLAGS])dnl -AS_VAR_PUSHDEF([Boost_lib_LDPATH], [boost_cv_lib_$1_LDPATH])dnl -AS_VAR_PUSHDEF([Boost_lib_LIBS], [boost_cv_lib_$1_LIBS])dnl -AS_IF([test x"$8" = "xno"], [not_found_header='true']) -BOOST_FIND_HEADER([$4], [$not_found_header]) -boost_save_CPPFLAGS=$CPPFLAGS -CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" -AC_CACHE_CHECK([for the Boost $1 library], [Boost_lib], - [_BOOST_FIND_LIBS($@)]) -case $Boost_lib in #( - (yes) _AC_MSG_LOG_CONFTEST - AC_DEFINE(AS_TR_CPP([HAVE_BOOST_$1]), [1], [Defined if the Boost $1 library is available])dnl - AC_SUBST(AS_TR_CPP([BOOST_$1_LDFLAGS]), [$Boost_lib_LDFLAGS])dnl - AC_SUBST(AS_TR_CPP([BOOST_$1_LDPATH]), [$Boost_lib_LDPATH])dnl - AC_SUBST([BOOST_LDPATH], [$Boost_lib_LDPATH])dnl - AC_SUBST(AS_TR_CPP([BOOST_$1_LIBS]), [$Boost_lib_LIBS])dnl - ;; - (no) _AC_MSG_LOG_CONFTEST - AS_IF([test x"$8" != "xno"], [ - AC_MSG_ERROR([cannot find flags to link with the Boost $1 library (libboost-$1)]) - ]) - ;; -esac -CPPFLAGS=$boost_save_CPPFLAGS -AS_VAR_POPDEF([Boost_lib])dnl -AS_VAR_POPDEF([Boost_lib_LDFLAGS])dnl -AS_VAR_POPDEF([Boost_lib_LDPATH])dnl -AS_VAR_POPDEF([Boost_lib_LIBS])dnl -AC_LANG_POP([C++])dnl -fi -]) - - -# BOOST_FIND_LIB([LIB-NAME], -# [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST], -# [CXX-PROLOGUE], [CXX-POST-INCLUDE-PROLOGUE], -# [ERROR_ON_UNUSABLE]) -# -------------------------------------------------------------- -# Backward compatibility wrapper for BOOST_FIND_LIBS. -# ERROR_ON_UNUSABLE can be set to "no" if the caller does not want their -# configure to fail -AC_DEFUN([BOOST_FIND_LIB], -[BOOST_FIND_LIBS([$1], $@)]) - - -# _BOOST_FIND_LIBS([LIB-NAME], [CANDIDATE-LIB-NAMES], -# [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST], -# [CXX-PROLOGUE], [CXX-POST-INCLUDE-PROLOGUE], -# [ERROR_ON_UNUSABLE]) -# -------------------------------------------------------------- -# Real implementation of BOOST_FIND_LIBS: rely on these local macros: -# Boost_lib, Boost_lib_LDFLAGS, Boost_lib_LDPATH, Boost_lib_LIBS -# -# The algorithm is as follows: first look for a given library name -# according to the user's PREFERRED-RT-OPT. For each library name, we -# prefer to use the ones that carry the tag (toolset name). Each -# library is searched through the various standard paths were Boost is -# usually installed. If we can't find the standard variants, we try -# to enforce -mt (for instance on MacOSX, libboost_thread.dylib -# doesn't exist but there's -obviously- libboost_thread-mt.dylib). -# -# ERROR_ON_UNUSABLE can be set to "no" if the caller does not want their -# configure to fail -AC_DEFUN([_BOOST_FIND_LIBS], -[Boost_lib=no - case "$3" in #( - (mt | mt-) boost_mt=-mt; boost_rtopt=;; #( - (mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X$3" : 'Xmt-*\(.*\)'`;; #( - (*) boost_mt=; boost_rtopt=$3;; - esac - if test $enable_static_boost = yes; then - boost_rtopt="s$boost_rtopt" - fi - # Find the proper debug variant depending on what we've been asked to find. - case $boost_rtopt in #( - (*d*) boost_rt_d=$boost_rtopt;; #( - (*[[sgpn]]*) # Insert the `d' at the right place (in between `sg' and `pn') - boost_rt_d=`echo "$boost_rtopt" | sed 's/\(s*g*\)\(p*n*\)/\1\2/'`;; #( - (*) boost_rt_d='-d';; - esac - # If the PREFERRED-RT-OPT are not empty, prepend a `-'. - test -n "$boost_rtopt" && boost_rtopt="-$boost_rtopt" - $boost_guess_use_mt && boost_mt=-mt - # Look for the abs path the static archive. - # $libext is computed by Libtool but let's make sure it's non empty. - test -z "$libext" && - AC_MSG_ERROR([the libext variable is empty, did you invoke Libtool?]) - boost_save_ac_objext=$ac_objext - # Generate the test file. - AC_LANG_CONFTEST([AC_LANG_PROGRAM([$7 -#include <$4> -$6], [$5])]) -dnl Optimization hacks: compiling C++ is slow, especially with Boost. What -dnl we're trying to do here is guess the right combination of link flags -dnl (LIBS / LDFLAGS) to use a given library. This can take several -dnl iterations before it succeeds and is thus *very* slow. So what we do -dnl instead is that we compile the code first (and thus get an object file, -dnl typically conftest.o). Then we try various combinations of link flags -dnl until we succeed to link conftest.o in an executable. The problem is -dnl that the various TRY_LINK / COMPILE_IFELSE macros of Autoconf always -dnl remove all the temporary files including conftest.o. So the trick here -dnl is to temporarily change the value of ac_objext so that conftest.o is -dnl preserved accross tests. This is obviously fragile and I will burn in -dnl hell for not respecting Autoconf's documented interfaces, but in the -dnl mean time, it optimizes the macro by a factor of 5 to 30. -dnl Another small optimization: the first argument of AC_COMPILE_IFELSE left -dnl empty because the test file is generated only once above (before we -dnl start the for loops). - AC_COMPILE_IFELSE([], - [ac_objext=do_not_rm_me_plz], - [AS_IF([test x"$8" != x"no"], [ - AC_MSG_ERROR([cannot compile a test that uses Boost $1]) - ]) - ]) - ac_objext=$boost_save_ac_objext - boost_failed_libs= -# Don't bother to ident the following nested for loops, only the 2 -# innermost ones matter. -for boost_lib_ in $2; do -for boost_tag_ in -$boost_cv_lib_tag ''; do -for boost_ver_ in -$boost_cv_lib_version ''; do -for boost_mt_ in $boost_mt -mt ''; do -for boost_rtopt_ in $boost_rtopt '' -d; do - for boost_full_suffix in \ - $boost_last_suffix \ - x$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \ - x$boost_tag_$boost_rtopt_$boost_ver_ \ - x$boost_tag_$boost_mt_$boost_ver_ \ - x$boost_tag_$boost_ver_ - do - boost_real_suffix=`echo "$boost_full_suffix" | sed 's/^x//'` - boost_lib="boost_$boost_lib_$boost_real_suffix" - # Avoid testing twice the same lib - case $boost_failed_libs in #( - (*@$boost_lib@*) continue;; - esac - # If with_boost is empty, we'll search in /lib first, which is not quite - # right so instead we'll try to a location based on where the headers are. - boost_tmp_lib=$with_boost - test x"$with_boost" = x && boost_tmp_lib=${boost_cv_inc_path%/include} - for boost_ldpath in "$boost_tmp_lib/lib" '' \ - /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \ - "$with_boost" C:/Boost/lib /lib* - do - # Don't waste time with directories that don't exist. - if test x"$boost_ldpath" != x && test ! -e "$boost_ldpath"; then - continue - fi - boost_save_LDFLAGS=$LDFLAGS - # Are we looking for a static library? - case $boost_ldpath:$boost_rtopt_ in #( - (*?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt) - Boost_lib_LIBS="$boost_ldpath/lib$boost_lib.$libext" - test -e "$Boost_lib_LIBS" || continue;; #( - (*) # No: use -lboost_foo to find the shared library. - Boost_lib_LIBS="-l$boost_lib";; - esac - boost_save_LIBS=$LIBS - LIBS="$Boost_lib_LIBS $LIBS" - test x"$boost_ldpath" != x && LDFLAGS="$LDFLAGS -L$boost_ldpath" -dnl First argument of AC_LINK_IFELSE left empty because the test file is -dnl generated only once above (before we start the for loops). - _BOOST_AC_LINK_IFELSE([], - [Boost_lib=yes], [Boost_lib=no]) - ac_objext=$boost_save_ac_objext - LDFLAGS=$boost_save_LDFLAGS - LIBS=$boost_save_LIBS - if test x"$Boost_lib" = xyes; then - # Check or used cached result of whether or not using -R or - # -rpath makes sense. Some implementations of ld, such as for - # Mac OSX, require -rpath but -R is the flag known to work on - # other systems. https://github.com/tsuna/boost.m4/issues/19 - AC_CACHE_VAL([boost_cv_rpath_link_ldflag], - [case $boost_ldpath in - '') # Nothing to do. - boost_cv_rpath_link_ldflag= - boost_rpath_link_ldflag_found=yes;; - *) - for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do - LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" - LIBS="$Boost_lib_LIBS $boost_save_LIBS" - _BOOST_AC_LINK_IFELSE([], - [boost_rpath_link_ldflag_found=yes - break], - [boost_rpath_link_ldflag_found=no]) - done - ;; - esac - AS_IF([test "x$boost_rpath_link_ldflag_found" != "xyes"], - [AC_MSG_ERROR([Unable to determine whether to use -R or -rpath])]) - LDFLAGS=$boost_save_LDFLAGS - LIBS=$boost_save_LIBS - ]) - test x"$boost_ldpath" != x && - Boost_lib_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" - Boost_lib_LDPATH="$boost_ldpath" - boost_last_suffix="$boost_full_suffix" - break 7 - else - boost_failed_libs="$boost_failed_libs@$boost_lib@" - fi - done - done -done -done -done -done -done # boost_lib_ -rm -f conftest.$ac_objext -]) - - - -# --------------------------------------- # -# Checks for the various Boost libraries. # -# --------------------------------------- # - -# List of boost libraries: http://www.boost.org/libs/libraries.htm -# The page http://beta.boost.org/doc/libs is useful: it gives the first release -# version of each library (among other things). - -# BOOST_DEFUN(LIBRARY, CODE) -# -------------------------- -# Define BOOST_ as a macro that runs CODE. -# -# Use indir to avoid the warning on underquoted macro name given to AC_DEFUN. -m4_define([BOOST_DEFUN], -[m4_indir([AC_DEFUN], - m4_toupper([BOOST_$1]), -[m4_pushdef([BOOST_Library], [$1])dnl -$2 -m4_popdef([BOOST_Library])dnl -]) -]) - - -# BOOST_ANY() -# ------------ -# Look for Boost.Any -BOOST_DEFUN([Any], -[BOOST_FIND_HEADER([boost/any.hpp])]) - - -# BOOST_ARRAY() -# ------------- -# Look for Boost.Array -BOOST_DEFUN([Array], -[BOOST_FIND_HEADER([boost/array.hpp])]) - - -# BOOST_ASIO() -# ------------ -# Look for Boost.Asio (new in Boost 1.35). -BOOST_DEFUN([Asio], -[AC_REQUIRE([BOOST_SYSTEM])dnl -BOOST_FIND_HEADER([boost/asio.hpp])]) - -# BOOST_BIMAP() -# ------------ -# Look for Boost.Bimap -BOOST_DEFUN([Bimap], -[BOOST_FIND_HEADER([boost/bimap.hpp])]) - - -# BOOST_ASSIGN() -# ------------- -# Look for Boost.Assign -BOOST_DEFUN([Assign], -[BOOST_FIND_HEADER([boost/assign.hpp])]) - - -# BOOST_ATOMIC([PREFERRED-RT-OPT], [ERROR_ON_UNUSABLE]) -# ------------------------------- -# Look for Boost.Atomic. For the documentation of PREFERRED-RT-OPT, see the -# documentation of BOOST_FIND_LIB above. -BOOST_DEFUN([Atomic], -[BOOST_FIND_LIB([atomic], [$1], - [boost/atomic.hpp], - [boost::atomic a;], - [ ], - [#ifdef HAVE_UNISTD_H -#include -#endif -#ifdef HAVE_STDINT_H -#include -#endif], [$2]) -])# BOOST_ATOMIC - - -# BOOST_BIND() -# ------------ -# Look for Boost.Bind. -BOOST_DEFUN([Bind], -[BOOST_FIND_HEADER([boost/bind.hpp])]) - - -# BOOST_CAST() -# ------------ -# Look for Boost.Cast -BOOST_DEFUN([Cast], -[BOOST_FIND_HEADER([boost/cast.hpp])]) - - -# BOOST_CHRONO([PREFERRED-RT-OPT], [ERROR_ON_UNUSABLE]) -# -------------- -# Look for Boost.Chrono. -BOOST_DEFUN([Chrono], -[# Do we have to check for Boost.System? This link-time dependency was -# added as of 1.35.0. If we have a version <1.35, we must not attempt to -# find Boost.System as it didn't exist by then. -if test $boost_major_version -ge 135; then - BOOST_SYSTEM([$1], [$2]) -fi # end of the Boost.System check. -boost_filesystem_save_LIBS=$LIBS -boost_filesystem_save_LDFLAGS=$LDFLAGS -m4_pattern_allow([^BOOST_SYSTEM_(LIBS|LDFLAGS)$])dnl -LIBS="$LIBS $BOOST_SYSTEM_LIBS" -LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS" -BOOST_FIND_LIB([chrono], [$1], - [boost/chrono.hpp], - [boost::chrono::thread_clock d;], [], [], [$2]) -if test $enable_static_boost = yes && test $boost_major_version -ge 135; then - BOOST_CHRONO_LIBS="$BOOST_CHRONO_LIBS $BOOST_SYSTEM_LIBS" -fi -LIBS=$boost_filesystem_save_LIBS -LDFLAGS=$boost_filesystem_save_LDFLAGS -])# BOOST_CHRONO - - -# BOOST_CONTEXT([PREFERRED-RT-OPT], [ERROR_ON_UNUSABLE]) -# ----------------------------------- -# Look for Boost.Context. For the documentation of PREFERRED-RT-OPT, see the -# documentation of BOOST_FIND_LIB above. -# -# * This library was introduced in Boost 1.51.0 -# * The signatures of make_fcontext() and jump_fcontext were changed in 1.56.0 -# * A dependency on boost_thread appears in 1.57.0 -# * The implementation details were moved to boost::context::detail in 1.61.0 -# * 1.61 also introduces execution_context_v2, which is the "lowest common -# denominator" for boost::context presence since then. -# * boost::context::fiber was introduced in 1.69 and execution_context_v2 was -# removed in 1.72 -BOOST_DEFUN([Context], -[boost_context_save_LIBS=$LIBS - boost_context_save_LDFLAGS=$LDFLAGS -if test $boost_major_version -ge 157; then - BOOST_THREAD([$1], [$2]) - m4_pattern_allow([^BOOST_THREAD_(LIBS|LDFLAGS)$])dnl - LIBS="$LIBS $BOOST_THREAD_LIBS" - LDFLAGS="$LDFLAGS $BOOST_THREAD_LDFLAGS" -fi - -if test $boost_major_version -ge 169; then - -BOOST_FIND_LIB([context], [$1], - [boost/context/fiber.hpp], [[ -namespace ctx=boost::context; -int a; -ctx::fiber source{[&a](ctx::fiber&& sink){ - a=0; - int b=1; - for(;;){ - sink=std::move(sink).resume(); - int next=a+b; - a=b; - b=next; - } - return std::move(sink); -}}; -for (int j=0;j<10;++j) { - source=std::move(source).resume(); -} -return a == 34; -]], [], [], [$2]) - -elif test $boost_major_version -ge 161; then - -BOOST_FIND_LIB([context], [$1], - [boost/context/execution_context_v2.hpp], [[ -namespace ctx=boost::context; -int res=0; -int n=35; -ctx::execution_context source( - [n, &res](ctx::execution_context sink, int) mutable { - int a=0; - int b=1; - while(n-->0){ - auto result=sink(a); - sink=std::move(std::get<0>(result)); - auto next=a+b; - a=b; - b=next; - } - return sink; - }); -for(int i=0;i<10;++i){ - auto result=source(i); - source=std::move(std::get<0>(result)); - res = std::get<1>(result); -} -return res == 34; -]], [], [], [$2]) - -else - -BOOST_FIND_LIB([context], [$1], - [boost/context/fcontext.hpp],[[ - -// creates a stack -void * stack_pointer = new void*[4096]; -std::size_t const size = sizeof(void*[4096]); - -#if BOOST_VERSION <= 105100 -ctx::make_fcontext(&fc, f); -return ctx::jump_fcontext(&fcm, &fc, 3) == 6; - -#else - -fc = ctx::make_fcontext(stack_pointer, size, f); -return ctx::jump_fcontext(&fcm, fc, 3) == 6; - -#endif - - -]],[dnl - -#include -#if BOOST_VERSION <= 105100 - -namespace ctx = boost::ctx; - -static ctx::fcontext_t fcm, fc; - -static void f(intptr_t i) { - ctx::jump_fcontext(&fc, &fcm, i * 2); -} - -#elif BOOST_VERSION <= 105500 - -namespace ctx = boost::context; - -// context -static ctx::fcontext_t fcm, *fc; - -// context-function -static void f(intptr_t i) { - ctx::jump_fcontext(fc, &fcm, i * 2); -} - -#else - -namespace ctx = boost::context; - -// context -static ctx::fcontext_t fcm, fc; - -// context-function -static void f(intptr_t i) { - ctx::jump_fcontext(&fc, fcm, i * 2); -} -#endif -], [], [], [$2]) - -fi - -LIBS=$boost_context_save_LIBS -LDFLAGS=$boost_context_save_LDFLAGS -])# BOOST_CONTEXT - - -# BOOST_CONVERSION() -# ------------------ -# Look for Boost.Conversion (cast / lexical_cast) -BOOST_DEFUN([Conversion], -[BOOST_FIND_HEADER([boost/cast.hpp]) -BOOST_FIND_HEADER([boost/lexical_cast.hpp]) -])# BOOST_CONVERSION - - -# BOOST_COROUTINE([PREFERRED-RT-OPT], [ERROR_ON_UNUSABLE]) -# ----------------------------------- -# Look for Boost.Coroutine. For the documentation of PREFERRED-RT-OPT, see the -# documentation of BOOST_FIND_LIB above. This library was introduced in Boost -# 1.53.0 -BOOST_DEFUN([Coroutine], -[ -boost_coroutine_save_LIBS=$LIBS -boost_coroutine_save_LDFLAGS=$LDFLAGS -# Link-time dependency from coroutine to context -BOOST_CONTEXT([$1], [$2]) -# Starting from Boost 1.55 a dependency on Boost.System is added -if test $boost_major_version -ge 155; then - BOOST_SYSTEM([$1], [$2]) -fi -m4_pattern_allow([^BOOST_(CONTEXT|SYSTEM)_(LIBS|LDFLAGS)]) -LIBS="$LIBS $BOOST_CONTEXT_LIBS $BOOST_SYSTEM_LIBS" -LDFLAGS="$LDFLAGS $BOOST_CONTEXT_LDFLAGS" - -# in 1.53 coroutine was a header only library -if test $boost_major_version -eq 153; then - AS_IF([test x"$2" = "xno"], [not_found_header='true']) - BOOST_FIND_HEADER([boost/coroutine/coroutine.hpp], [$not_found_header]) -else - BOOST_FIND_LIB([coroutine], [$1], - [boost/coroutine/coroutine.hpp], - [ - #include - #if BOOST_VERSION <= 105500 - boost::coroutines::coroutine coro; coro.get(); - #else - boost::coroutines::asymmetric_coroutine::pull_type coro; coro.get(); - #endif - ], [], [], [$2]) -fi -# Link-time dependency from coroutine to context, existed only in 1.53, in 1.54 -# coroutine doesn't use context from its headers but from its library. -if test $boost_major_version -eq 153 || test $enable_static_boost = yes && test $boost_major_version -ge 154; then - BOOST_COROUTINE_LIBS="$BOOST_COROUTINE_LIBS $BOOST_CONTEXT_LIBS" - BOOST_COROUTINE_LDFLAGS="$BOOST_COROUTINE_LDFLAGS $BOOST_CONTEXT_LDFLAGS" -fi -if test $enable_static_boost = yes && test $boost_major_version -ge 155; then - BOOST_COROUTINE_LIBS="$BOOST_COROUTINE_LIBS $BOOST_SYSTEM_LIBS" - BOOST_COROUTINE_LDFLAGS="$BOOST_COROUTINE_LDFLAGS $BOOST_SYSTEM_LDFLAGS" -fi -LIBS=$boost_coroutine_save_LIBS -LDFLAGS=$boost_coroutine_save_LDFLAGS -])# BOOST_COROUTINE - - -# BOOST_CRC() -# ----------- -# Look for Boost.CRC -BOOST_DEFUN([CRC], -[BOOST_FIND_HEADER([boost/crc.hpp]) -])# BOOST_CRC - - -# BOOST_DATE_TIME([PREFERRED-RT-OPT], [ERROR_ON_UNUSABLE]) -# ----------------------------------- -# Look for Boost.Date_Time. For the documentation of PREFERRED-RT-OPT, see the -# documentation of BOOST_FIND_LIB above. -BOOST_DEFUN([Date_Time], -[BOOST_FIND_LIB([date_time], [$1], - [boost/date_time/posix_time/posix_time.hpp], - [boost::posix_time::ptime t;], [], [], [$2]) -])# BOOST_DATE_TIME - - -# BOOST_EXCEPTION() -# ------------ -# Look for Boost.Exception -BOOST_DEFUN([Exception], -[BOOST_FIND_HEADER([boost/exception/all.hpp])]) - - -# BOOST_FILESYSTEM([PREFERRED-RT-OPT], [ERROR_ON_UNUSABLE]) -# ------------------------------------ -# Look for Boost.Filesystem. For the documentation of PREFERRED-RT-OPT, see -# the documentation of BOOST_FIND_LIB above. -# Do not check for boost/filesystem.hpp because this file was introduced in -# 1.34. -BOOST_DEFUN([Filesystem], -[# Do we have to check for Boost.System? This link-time dependency was -# added as of 1.35.0. If we have a version <1.35, we must not attempt to -# find Boost.System as it didn't exist by then. -if test $boost_major_version -ge 135; then - BOOST_SYSTEM([$1], [$2]) -fi # end of the Boost.System check. -boost_filesystem_save_LIBS=$LIBS -boost_filesystem_save_LDFLAGS=$LDFLAGS -m4_pattern_allow([^BOOST_SYSTEM_(LIBS|LDFLAGS)$])dnl -LIBS="$LIBS $BOOST_SYSTEM_LIBS" -LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS" -BOOST_FIND_LIB([filesystem], [$1], - [boost/filesystem/path.hpp], [boost::filesystem::path p;], - [], [], [$2]) -if test $enable_static_boost = yes && test $boost_major_version -ge 135; then - BOOST_FILESYSTEM_LIBS="$BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS" -fi -LIBS=$boost_filesystem_save_LIBS -LDFLAGS=$boost_filesystem_save_LDFLAGS -])# BOOST_FILESYSTEM - - -# BOOST_FLYWEIGHT() -# ----------------- -# Look for Boost.Flyweight. -BOOST_DEFUN([Flyweight], -[dnl There's a hidden dependency on pthreads. -AC_REQUIRE([_BOOST_PTHREAD_FLAG])dnl -BOOST_FIND_HEADER([boost/flyweight.hpp]) -AC_SUBST([BOOST_FLYWEIGHT_LIBS], [$boost_cv_pthread_flag]) -]) - - -# BOOST_FOREACH() -# --------------- -# Look for Boost.Foreach. -BOOST_DEFUN([Foreach], -[BOOST_FIND_HEADER([boost/foreach.hpp])]) - - -# BOOST_FORMAT() -# -------------- -# Look for Boost.Format. -# Note: we can't check for boost/format/format_fwd.hpp because the header isn't -# standalone. It can't be compiled because it triggers the following error: -# boost/format/detail/config_macros.hpp:88: error: 'locale' in namespace 'std' -# does not name a type -BOOST_DEFUN([Format], -[BOOST_FIND_HEADER([boost/format.hpp])]) - - -# BOOST_FUNCTION() -# ---------------- -# Look for Boost.Function -BOOST_DEFUN([Function], -[BOOST_FIND_HEADER([boost/function.hpp])]) - - -# BOOST_FUSION() -# ----------------- -# Look for Boost.Fusion -BOOST_DEFUN([Fusion], -[BOOST_FIND_HEADER([boost/fusion/sequence.hpp])]) - - -# BOOST_GEOMETRY() -# ---------------- -# Look for Boost.Geometry (new since 1.47.0). -BOOST_DEFUN([Geometry], -[BOOST_FIND_HEADER([boost/geometry.hpp]) -])# BOOST_GEOMETRY - - -# BOOST_GRAPH([PREFERRED-RT-OPT], [ERROR_ON_UNUSABLE]) -# ------------------------------- -# Look for Boost.Graphs. For the documentation of PREFERRED-RT-OPT, see the -# documentation of BOOST_FIND_LIB above. -BOOST_DEFUN([Graph], -[boost_graph_save_LIBS=$LIBS -boost_graph_save_LDFLAGS=$LDFLAGS -# Link-time dependency from graph to regex was added as of 1.40.0. -if test $boost_major_version -ge 140; then - BOOST_REGEX([$1], [$2]) - m4_pattern_allow([^BOOST_REGEX_(LIBS|LDFLAGS)$])dnl - LIBS="$LIBS $BOOST_REGEX_LIBS" - LDFLAGS="$LDFLAGS $BOOST_REGEX_LDFLAGS" -fi -BOOST_FIND_LIB([graph], [$1], - [boost/graph/adjacency_list.hpp], [boost::adjacency_list<> g;], - [], [], [$2]) -LIBS=$boost_graph_save_LIBS -LDFLAGS=$boost_graph_save_LDFLAGS -])# BOOST_GRAPH - - -# BOOST_HASH() -# ------------ -# Look for Boost.Functional/Hash -BOOST_DEFUN([Hash], -[BOOST_FIND_HEADER([boost/functional/hash.hpp])]) - - -# BOOST_IOSTREAMS([PREFERRED-RT-OPT], [ERROR_ON_UNUSABLE]) -# ----------------------------------- -# Look for Boost.IOStreams. For the documentation of PREFERRED-RT-OPT, see the -# documentation of BOOST_FIND_LIB above. -BOOST_DEFUN([IOStreams], -[BOOST_FIND_LIB([iostreams], [$1], - [boost/iostreams/device/file_descriptor.hpp], - [boost::iostreams::file_descriptor fd; fd.close();], - [], [], [$2]) -])# BOOST_IOSTREAMS - - -# BOOST_ITERATOR() -# ------------ -# Look for Boost.Iterator -BOOST_DEFUN([Iterator], -[BOOST_FIND_HEADER([boost/iterator/iterator_adaptor.hpp])]) - - -# BOOST_LAMBDA() -# -------------- -# Look for Boost.Lambda -BOOST_DEFUN([Lambda], -[BOOST_FIND_HEADER([boost/lambda/lambda.hpp])]) - - -# BOOST_LOCALE([PREFERRED-RT-OPT], [ERROR_ON_UNUSABLE]) -# -------------- -# Look for Boost.Locale -BOOST_DEFUN([Locale], -[ -boost_locale_save_LIBS=$LIBS -boost_locale_save_LDFLAGS=$LDFLAGS -# require SYSTEM for boost-1.50.0 and up -if test $boost_major_version -ge 150; then - BOOST_SYSTEM([$1], [$2]) - m4_pattern_allow([^BOOST_SYSTEM_(LIBS|LDFLAGS)$])dnl - LIBS="$LIBS $BOOST_SYSTEM_LIBS" - LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS" -fi # end of the Boost.System check. -BOOST_FIND_LIB([locale], [$1], - [boost/locale.hpp], - [[boost::locale::generator gen; std::locale::global(gen(""));]], [], [], [$2]) -LIBS=$boost_locale_save_LIBS -LDFLAGS=$boost_locale_save_LDFLAGS -])# BOOST_LOCALE - -# BOOST_LOG([PREFERRED-RT-OPT], [ERROR_ON_UNUSABLE]) -# ----------------------------- -# Look for Boost.Log. For the documentation of PREFERRED-RT-OPT, see the -# documentation of BOOST_FIND_LIB above. -BOOST_DEFUN([Log], -[boost_log_save_LIBS=$LIBS -boost_log_save_LDFLAGS=$LDFLAGS -BOOST_SYSTEM([$1], [$2]) -BOOST_FILESYSTEM([$1], [$2]) -BOOST_DATE_TIME([$1], [$2]) -m4_pattern_allow([^BOOST_(SYSTEM|FILESYSTEM|DATE_TIME)_(LIBS|LDFLAGS)$])dnl -LIBS="$LIBS $BOOST_DATE_TIME_LIBS $BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS" -LDFLAGS="$LDFLAGS $BOOST_DATE_TIME_LDFLAGS $BOOST_FILESYSTEM_LDFLAGS $BOOST_SYSTEM_LDFLAGS" -BOOST_FIND_LIB([log], [$1], - [boost/log/core/core.hpp], - [boost::log::attribute a; a.get_value();], [], [], [$2]) -LIBS=$boost_log_save_LIBS -LDFLAGS=$boost_log_save_LDFLAGS -])# BOOST_LOG - - -# BOOST_LOG_SETUP([PREFERRED-RT-OPT], [ERROR_ON_UNUSABLE]) -# ----------------------------------- -# Look for Boost.Log. For the documentation of PREFERRED-RT-OPT, see the -# documentation of BOOST_FIND_LIB above. -BOOST_DEFUN([Log_Setup], -[boost_log_setup_save_LIBS=$LIBS -boost_log_setup_save_LDFLAGS=$LDFLAGS -BOOST_LOG([$1]) -m4_pattern_allow([^BOOST_LOG_(LIBS|LDFLAGS)$])dnl -LIBS="$LIBS $BOOST_LOG_LIBS" -LDFLAGS="$LDFLAGS $BOOST_LOG_LDFLAGS" -BOOST_FIND_LIB([log_setup], [$1], - [boost/log/utility/setup/from_settings.hpp], - [boost::log::basic_settings bs; bs.empty();], [], [], [$2]) -LIBS=$boost_log_setup_save_LIBS -LDFLAGS=$boost_log_setup_save_LDFLAGS -])# BOOST_LOG_SETUP - - -# BOOST_MATH() -# ------------ -# Look for Boost.Math -# TODO: This library isn't header-only but it comes in multiple different -# flavors that don't play well with BOOST_FIND_LIB (e.g, libboost_math_c99, -# libboost_math_c99f, libboost_math_c99l, libboost_math_tr1, -# libboost_math_tr1f, libboost_math_tr1l). This macro must be fixed to do the -# right thing anyway. -BOOST_DEFUN([Math], -[BOOST_FIND_HEADER([boost/math/special_functions.hpp])]) - - -# BOOST_MPI([PREFERRED-RT-OPT], [ERROR_ON_UNUSABLE]) -# ------------------------------- -# Look for Boost MPI. For the documentation of PREFERRED-RT-OPT, see the -# documentation of BOOST_FIND_LIB above. Uses MPICXX variable if it is -# set, otherwise tries CXX -# -BOOST_DEFUN([MPI], -[boost_save_CXX=${CXX} -boost_save_CXXCPP=${CXXCPP} -if test x"${MPICXX}" != x; then - CXX=${MPICXX} - CXXCPP="${MPICXX} -E" -fi -BOOST_FIND_LIB([mpi], [$1], - [boost/mpi.hpp], - [int argc = 0; - char **argv = 0; - boost::mpi::environment env(argc,argv);], - [], [], [$2]) -CXX=${boost_save_CXX} -CXXCPP=${boost_save_CXXCPP} -])# BOOST_MPI - - -# BOOST_MPL() -# ------------------ -# Look for Boost.MPL -BOOST_DEFUN([MPL], -[BOOST_FIND_HEADER([boost/mpl/for_each.hpp])]) - - -# BOOST_MULTIARRAY() -# ------------------ -# Look for Boost.MultiArray -BOOST_DEFUN([MultiArray], -[BOOST_FIND_HEADER([boost/multi_array.hpp])]) - - -# BOOST_MULTIINDEXCCONTAINER() -# ------------------ -# Look for Boost.MultiIndexContainer -BOOST_DEFUN([MultiIndexContainer], -[BOOST_FIND_HEADER([boost/multi_index_container.hpp])]) - - -# BOOST_NUMERIC_UBLAS() -# -------------------------- -# Look for Boost.NumericUblas (Basic Linear Algebra) -BOOST_DEFUN([Numeric_Ublas], -[BOOST_FIND_HEADER([boost/numeric/ublas/vector.hpp]) -])# BOOST_NUMERIC_UBLAS - - -# BOOST_NUMERIC_CONVERSION() -# -------------------------- -# Look for Boost.NumericConversion (policy-based numeric conversion) -BOOST_DEFUN([Numeric_Conversion], -[BOOST_FIND_HEADER([boost/numeric/conversion/converter.hpp]) -])# BOOST_NUMERIC_CONVERSION - - -# BOOST_OPTIONAL() -# ---------------- -# Look for Boost.Optional -BOOST_DEFUN([Optional], -[BOOST_FIND_HEADER([boost/optional.hpp])]) - - -# BOOST_PREPROCESSOR() -# -------------------- -# Look for Boost.Preprocessor -BOOST_DEFUN([Preprocessor], -[BOOST_FIND_HEADER([boost/preprocessor/repeat.hpp])]) - - -# BOOST_PROPERTY_TREE([PREFERRED-RT-OPT], [ERROR_ON_UNUSABLE]) -# ----------------------------------------- -# Look for Boost.Property_Tree. For the documentation of PREFERRED-RT-OPT, -# see the documentation of BOOST_FIND_LIB above. -BOOST_DEFUN([Property_Tree], -[BOOST_FIND_LIB([property_tree], [$1], - [boost/property_tree/ptree.hpp], - [boost::property_tree::ptree pt; boost::property_tree::read_xml d("test", pt);], - [], [], [$2]) -])# BOOST_PROPERTY_TREE - - -# BOOST_RANDOM() -# -------------------- -# Look for Boost.Random -BOOST_DEFUN([Random], -[BOOST_FIND_HEADER([boost/random/random_number_generator.hpp])]) - - -# BOOST_RANGE() -# -------------------- -# Look for Boost.Range -BOOST_DEFUN([Range], -[BOOST_FIND_HEADER([boost/range/adaptors.hpp])]) - -# BOOST_UNORDERED() -# ----------------- -# Look for Boost.Unordered -BOOST_DEFUN([Unordered], -[BOOST_FIND_HEADER([boost/unordered_map.hpp])]) - - -# BOOST_UUID() -# ------------ -# Look for Boost.Uuid -BOOST_DEFUN([Uuid], -[BOOST_FIND_HEADER([boost/uuid/uuid.hpp])]) - - -# BOOST_PROGRAM_OPTIONS([PREFERRED-RT-OPT], [ERROR_ON_UNUSABLE]) -# ----------------------------------------- -# Look for Boost.Program_options. For the documentation of PREFERRED-RT-OPT, -# see the documentation of BOOST_FIND_LIB above. -BOOST_DEFUN([Program_Options], -[BOOST_FIND_LIB([program_options], [$1], - [boost/program_options.hpp], - [boost::program_options::options_description d("test");], - [], [], [$2]) -])# BOOST_PROGRAM_OPTIONS - - - -# _BOOST_PYTHON_CONFIG(VARIABLE, FLAG) -# ------------------------------------ -# Save VARIABLE, and define it via `python-config --FLAG`. -# Substitute BOOST_PYTHON_VARIABLE. -m4_define([_BOOST_PYTHON_CONFIG], -[AC_SUBST([BOOST_PYTHON_$1], - [`python-config --$2 2>/dev/null`])dnl -boost_python_save_$1=$$1 -$1="$$1 $BOOST_PYTHON_$1"]) - - -# BOOST_PYTHON([PREFERRED-RT-OPT], [ERROR_ON_UNUSABLE]) -# -------------------------------- -# Look for Boost.Python. For the documentation of PREFERRED-RT-OPT, -# see the documentation of BOOST_FIND_LIB above. -BOOST_DEFUN([Python], -[_BOOST_PYTHON_CONFIG([CPPFLAGS], [includes]) -_BOOST_PYTHON_CONFIG([LDFLAGS], [ldflags]) -_BOOST_PYTHON_CONFIG([LIBS], [libs]) -m4_pattern_allow([^BOOST_PYTHON_MODULE$])dnl -BOOST_FIND_LIBS([python], [python python3], [$1], - [boost/python.hpp], - [], [BOOST_PYTHON_MODULE(empty) {}], [], [$2]) -CPPFLAGS=$boost_python_save_CPPFLAGS -LDFLAGS=$boost_python_save_LDFLAGS -LIBS=$boost_python_save_LIBS -])# BOOST_PYTHON - - -# BOOST_REF() -# ----------- -# Look for Boost.Ref -BOOST_DEFUN([Ref], -[BOOST_FIND_HEADER([boost/ref.hpp])]) - - -# BOOST_REGEX([PREFERRED-RT-OPT], [ERROR_ON_UNUSABLE]) -# ------------------------------- -# Look for Boost.Regex. For the documentation of PREFERRED-RT-OPT, see the -# documentation of BOOST_FIND_LIB above. -BOOST_DEFUN([Regex], -[BOOST_FIND_LIB([regex], [$1], - [boost/regex.hpp], - [boost::regex exp("*"); boost::regex_match("foo", exp);], - [], [], [$2]) -])# BOOST_REGEX - - -# BOOST_SCOPE_EXIT() -# ------------ -# Look for Boost.ScopeExit. -BOOST_DEFUN([SCOPE_EXIT], -[BOOST_FIND_HEADER([boost/scope_exit.hpp])]) - - -# BOOST_SERIALIZATION([PREFERRED-RT-OPT], [ERROR_ON_UNUSABLE]) -# --------------------------------------- -# Look for Boost.Serialization. For the documentation of PREFERRED-RT-OPT, see -# the documentation of BOOST_FIND_LIB above. -BOOST_DEFUN([Serialization], -[BOOST_FIND_LIB([serialization], [$1], - [boost/archive/text_oarchive.hpp], - [std::ostream* o = 0; // Cheap way to get an ostream... - boost::archive::text_oarchive t(*o);], - [], [], [$2]) -])# BOOST_SERIALIZATION - - -# BOOST_SIGNALS([PREFERRED-RT-OPT], [ERROR_ON_UNUSABLE]) -# --------------------------------- -# Look for Boost.Signals. For the documentation of PREFERRED-RT-OPT, see the -# documentation of BOOST_FIND_LIB above. -BOOST_DEFUN([Signals], -[BOOST_FIND_LIB([signals], [$1], - [boost/signal.hpp], - [boost::signal s;], - [], [], [$2]) -])# BOOST_SIGNALS - - -# BOOST_SIGNALS2() -# ---------------- -# Look for Boost.Signals2 (new since 1.39.0). -BOOST_DEFUN([Signals2], -[BOOST_FIND_HEADER([boost/signals2.hpp]) -])# BOOST_SIGNALS2 - - -# BOOST_SMART_PTR() -# ----------------- -# Look for Boost.SmartPtr -BOOST_DEFUN([Smart_Ptr], -[BOOST_FIND_HEADER([boost/scoped_ptr.hpp]) -BOOST_FIND_HEADER([boost/shared_ptr.hpp]) -]) - - -# BOOST_STATICASSERT() -# -------------------- -# Look for Boost.StaticAssert -BOOST_DEFUN([StaticAssert], -[BOOST_FIND_HEADER([boost/static_assert.hpp])]) - - -# BOOST_STRING_ALGO() -# ------------------- -# Look for Boost.StringAlgo -BOOST_DEFUN([String_Algo], -[BOOST_FIND_HEADER([boost/algorithm/string.hpp]) -]) - - -# BOOST_SYSTEM([PREFERRED-RT-OPT], [ERROR_ON_UNUSABLE]) -# -------------------------------- -# Look for Boost.System. For the documentation of PREFERRED-RT-OPT, see the -# documentation of BOOST_FIND_LIB above. This library was introduced in Boost -# 1.35.0. -BOOST_DEFUN([System], -[BOOST_FIND_LIB([system], [$1], - [boost/system/error_code.hpp], - [boost::system::error_code e; e.clear();], [], [], [$2]) -])# BOOST_SYSTEM - - -# BOOST_TEST([PREFERRED-RT-OPT], [ERROR_ON_UNUSABLE]) -# ------------------------------ -# Look for Boost.Test. For the documentation of PREFERRED-RT-OPT, see the -# documentation of BOOST_FIND_LIB above. -BOOST_DEFUN([Test], -[m4_pattern_allow([^BOOST_CHECK$])dnl -BOOST_FIND_LIB([unit_test_framework], [$1], - [boost/test/unit_test.hpp], [BOOST_CHECK(2 == 2);], - [using boost::unit_test::test_suite; - test_suite* init_unit_test_suite(int argc, char ** argv) - { return NULL; }], [], [$2]) -])# BOOST_TEST - - -# BOOST_THREAD([PREFERRED-RT-OPT], [ERROR_ON_UNUSABLE]) -# --------------------------------- -# Look for Boost.Thread. For the documentation of PREFERRED-RT-OPT, see the -# documentation of BOOST_FIND_LIB above. -BOOST_DEFUN([Thread], -[dnl Having the pthread flag is required at least on GCC3 where -dnl boost/thread.hpp would complain if we try to compile without -dnl -pthread on GNU/Linux. -AC_REQUIRE([_BOOST_PTHREAD_FLAG])dnl -boost_thread_save_LIBS=$LIBS -boost_thread_save_LDFLAGS=$LDFLAGS -boost_thread_save_CPPFLAGS=$CPPFLAGS -# Link-time dependency from thread to system was added as of 1.49.0. -if test $boost_major_version -ge 149; then -BOOST_SYSTEM([$1], [$2]) -fi # end of the Boost.System check. -m4_pattern_allow([^BOOST_SYSTEM_(LIBS|LDFLAGS)$])dnl -LIBS="$LIBS $BOOST_SYSTEM_LIBS $boost_cv_pthread_flag" -LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS" -CPPFLAGS="$CPPFLAGS $boost_cv_pthread_flag" - -# When compiling for the Windows platform, the threads library is named -# differently. This suffix doesn't exist in new versions of Boost, or -# possibly new versions of GCC on mingw I am assuming it's Boost's change for -# now and I am setting version to 1.48, for lack of knowledge as to when this -# change occurred. -if test $boost_major_version -lt 148; then - case $host_os in - (*mingw*) boost_thread_lib_ext=_win32;; - esac -fi -BOOST_FIND_LIBS([thread], [thread$boost_thread_lib_ext], - [$1], - [boost/thread.hpp], [boost::thread t; boost::mutex m;], [], [], [$2]) - -case $host_os in - (*mingw*) boost_thread_w32_socket_link=-lws2_32;; -esac - -BOOST_THREAD_LIBS="$BOOST_THREAD_LIBS $BOOST_SYSTEM_LIBS $boost_cv_pthread_flag $boost_thread_w32_socket_link" -BOOST_THREAD_LDFLAGS="$BOOST_SYSTEM_LDFLAGS" -BOOST_CPPFLAGS="$BOOST_CPPFLAGS $boost_cv_pthread_flag" -LIBS=$boost_thread_save_LIBS -LDFLAGS=$boost_thread_save_LDFLAGS -CPPFLAGS=$boost_thread_save_CPPFLAGS -])# BOOST_THREAD - -AU_ALIAS([BOOST_THREADS], [BOOST_THREAD]) - - -# BOOST_TOKENIZER() -# ----------------- -# Look for Boost.Tokenizer -BOOST_DEFUN([Tokenizer], -[BOOST_FIND_HEADER([boost/tokenizer.hpp])]) - - -# BOOST_TRIBOOL() -# --------------- -# Look for Boost.Tribool -BOOST_DEFUN([Tribool], -[BOOST_FIND_HEADER([boost/logic/tribool_fwd.hpp]) -BOOST_FIND_HEADER([boost/logic/tribool.hpp]) -]) - - -# BOOST_TUPLE() -# ------------- -# Look for Boost.Tuple -BOOST_DEFUN([Tuple], -[BOOST_FIND_HEADER([boost/tuple/tuple.hpp])]) - - -# BOOST_TYPETRAITS() -# -------------------- -# Look for Boost.TypeTraits -BOOST_DEFUN([TypeTraits], -[BOOST_FIND_HEADER([boost/type_traits.hpp])]) - - -# BOOST_UTILITY() -# --------------- -# Look for Boost.Utility (noncopyable, result_of, base-from-member idiom, -# etc.) -BOOST_DEFUN([Utility], -[BOOST_FIND_HEADER([boost/utility.hpp])]) - - -# BOOST_VARIANT() -# --------------- -# Look for Boost.Variant. -BOOST_DEFUN([Variant], -[BOOST_FIND_HEADER([boost/variant/variant_fwd.hpp]) -BOOST_FIND_HEADER([boost/variant.hpp])]) - - -# BOOST_POINTER_CONTAINER() -# ------------------------ -# Look for Boost.PointerContainer -BOOST_DEFUN([Pointer_Container], -[BOOST_FIND_HEADER([boost/ptr_container/ptr_deque.hpp]) -BOOST_FIND_HEADER([boost/ptr_container/ptr_list.hpp]) -BOOST_FIND_HEADER([boost/ptr_container/ptr_vector.hpp]) -BOOST_FIND_HEADER([boost/ptr_container/ptr_array.hpp]) -BOOST_FIND_HEADER([boost/ptr_container/ptr_set.hpp]) -BOOST_FIND_HEADER([boost/ptr_container/ptr_map.hpp]) -])# BOOST_POINTER_CONTAINER - - -# BOOST_WAVE([PREFERRED-RT-OPT], [ERROR_ON_UNUSABLE]) -# ------------------------------ -# NOTE: If you intend to use Wave/Spirit with thread support, make sure you -# call BOOST_THREAD first. -# Look for Boost.Wave. For the documentation of PREFERRED-RT-OPT, see the -# documentation of BOOST_FIND_LIB above. -BOOST_DEFUN([Wave], -[AC_REQUIRE([BOOST_FILESYSTEM])dnl -AC_REQUIRE([BOOST_DATE_TIME])dnl -boost_wave_save_LIBS=$LIBS -boost_wave_save_LDFLAGS=$LDFLAGS -m4_pattern_allow([^BOOST_((FILE)?SYSTEM|DATE_TIME|THREAD)_(LIBS|LDFLAGS)$])dnl -LIBS="$LIBS $BOOST_SYSTEM_LIBS $BOOST_FILESYSTEM_LIBS $BOOST_DATE_TIME_LIBS \ -$BOOST_THREAD_LIBS" -LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS $BOOST_FILESYSTEM_LDFLAGS \ -$BOOST_DATE_TIME_LDFLAGS $BOOST_THREAD_LDFLAGS" -BOOST_FIND_LIB([wave], [$1], - [boost/wave.hpp], - [boost::wave::token_id id; get_token_name(id);], [], [], [$2]) -LIBS=$boost_wave_save_LIBS -LDFLAGS=$boost_wave_save_LDFLAGS -])# BOOST_WAVE - - -# BOOST_XPRESSIVE() -# ----------------- -# Look for Boost.Xpressive (new since 1.36.0). -BOOST_DEFUN([Xpressive], -[BOOST_FIND_HEADER([boost/xpressive/xpressive.hpp])]) - - -# ----------------- # -# Internal helpers. # -# ----------------- # - - -# _BOOST_PTHREAD_FLAG() -# --------------------- -# Internal helper for BOOST_THREAD. Computes boost_cv_pthread_flag -# which must be used in CPPFLAGS and LIBS. -# -# Yes, we *need* to put the -pthread thing in CPPFLAGS because with GCC3, -# boost/thread.hpp will trigger a #error if -pthread isn't used: -# boost/config/requires_threads.hpp:47:5: #error "Compiler threading support -# is not turned on. Please set the correct command line options for -# threading: -pthread (Linux), -pthreads (Solaris) or -mthreads (Mingw32)" -# -# Based on ACX_PTHREAD: http://autoconf-archive.cryp.to/acx_pthread.html -AC_DEFUN([_BOOST_PTHREAD_FLAG], -[AC_REQUIRE([AC_PROG_CXX])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_LANG_PUSH([C++])dnl -AC_CACHE_CHECK([for the flags needed to use pthreads], [boost_cv_pthread_flag], -[ boost_cv_pthread_flag= - # The ordering *is* (sometimes) important. Some notes on the - # individual items follow: - # (none): in case threads are in libc; should be tried before -Kthread and - # other compiler flags to prevent continual compiler warnings - # -lpthreads: AIX (must check this before -lpthread) - # -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) - # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) - # -llthread: LinuxThreads port on FreeBSD (also preferred to -pthread) - # -pthread: GNU Linux/GCC (kernel threads), BSD/GCC (userland threads) - # -pthreads: Solaris/GCC - # -mthreads: MinGW32/GCC, Lynx/GCC - # -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it - # doesn't hurt to check since this sometimes defines pthreads too; - # also defines -D_REENTRANT) - # ... -mt is also the pthreads flag for HP/aCC - # -lpthread: GNU Linux, etc. - # --thread-safe: KAI C++ - case $host_os in #( - *solaris*) - # On Solaris (at least, for some versions), libc contains stubbed - # (non-functional) versions of the pthreads routines, so link-based - # tests will erroneously succeed. (We need to link with -pthreads/-mt/ - # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather - # a function called by this macro, so we could check for that, but - # who knows whether they'll stub that too in a future libc.) So, - # we'll just look for -pthreads and -lpthread first: - boost_pthread_flags="-pthreads -lpthread -mt -pthread";; #( - *) - boost_pthread_flags="-lpthreads -Kthread -kthread -llthread -pthread \ - -pthreads -mthreads -lpthread --thread-safe -mt";; - esac - # Generate the test file. - AC_LANG_CONFTEST([AC_LANG_PROGRAM([#include ], - [pthread_t th; pthread_join(th, 0); - pthread_attr_init(0); pthread_cleanup_push(0, 0); - pthread_create(0,0,0,0); pthread_cleanup_pop(0);])]) - for boost_pthread_flag in '' $boost_pthread_flags; do - boost_pthread_ok=false -dnl Re-use the test file already generated. - boost_pthreads__save_LIBS=$LIBS - LIBS="$LIBS $boost_pthread_flag" - AC_LINK_IFELSE([], - [if grep ".*$boost_pthread_flag" conftest.err; then - echo "This flag seems to have triggered warnings" >&AS_MESSAGE_LOG_FD - else - boost_pthread_ok=:; boost_cv_pthread_flag=$boost_pthread_flag - fi]) - LIBS=$boost_pthreads__save_LIBS - $boost_pthread_ok && break - done -]) -AC_LANG_POP([C++])dnl -])# _BOOST_PTHREAD_FLAG - - -# _BOOST_gcc_test(MAJOR, MINOR) -# ----------------------------- -# Internal helper for _BOOST_FIND_COMPILER_TAG. -m4_define([_BOOST_gcc_test], -["defined __GNUC__ && __GNUC__ == $1 && __GNUC_MINOR__ == $2 && !defined __ICC @ gcc$1$2"])dnl - -# _BOOST_mingw_test(MAJOR, MINOR) -# ----------------------------- -# Internal helper for _BOOST_FIND_COMPILER_TAG. -m4_define([_BOOST_mingw_test], -["defined __GNUC__ && __GNUC__ == $1 && __GNUC_MINOR__ == $2 && !defined __ICC && \ - (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \ - || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw$1$2"])dnl - - -# _BOOST_FIND_COMPILER_TAG() -# -------------------------- -# Internal. When Boost is installed without --layout=system, each library -# filename will hold a suffix that encodes the compiler used during the -# build. The Boost build system seems to call this a `tag'. -AC_DEFUN([_BOOST_FIND_COMPILER_TAG], -[AC_REQUIRE([AC_PROG_CXX])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_CACHE_CHECK([for the toolset name used by Boost for $CXX], - [boost_cv_lib_tag], -[boost_cv_lib_tag=unknown -if test x$boost_cv_inc_path != xno; then - AC_LANG_PUSH([C++])dnl - # The following tests are mostly inspired by boost/config/auto_link.hpp - # The list is sorted to most recent/common to oldest compiler (in order - # to increase the likelihood of finding the right compiler with the - # least number of compilation attempt). - # Beware that some tests are sensible to the order (for instance, we must - # look for MinGW before looking for GCC3). - # I used one compilation test per compiler with a #error to recognize - # each compiler so that it works even when cross-compiling (let me know - # if you know a better approach). - # Known missing tags (known from Boost's tools/build/v2/tools/common.jam): - # como, edg, kcc, bck, mp, sw, tru, xlc - # I'm not sure about my test for `il' (be careful: Intel's ICC pre-defines - # the same defines as GCC's). - for i in \ - "defined __clang__ && __clang_major__ == 8 && __clang_minor__ == 0 @ clang80" \ - "defined __clang__ && __clang_major__ == 7 && __clang_minor__ == 0 @ clang70" \ - "defined __clang__ && __clang_major__ == 6 && __clang_minor__ == 0 @ clang60" \ - "defined __clang__ && __clang_major__ == 5 && __clang_minor__ == 0 @ clang50" \ - "defined __clang__ && __clang_major__ == 4 && __clang_minor__ == 0 @ clang40" \ - "defined __clang__ && __clang_major__ == 3 && __clang_minor__ == 9 @ clang39" \ - "defined __clang__ && __clang_major__ == 3 && __clang_minor__ == 8 @ clang38" \ - "defined __clang__ && __clang_major__ == 3 && __clang_minor__ == 7 @ clang37" \ - _BOOST_mingw_test(9, 1) \ - _BOOST_gcc_test(9, 1) \ - _BOOST_mingw_test(9, 0) \ - _BOOST_gcc_test(9, 0) \ - _BOOST_mingw_test(8, 3) \ - _BOOST_gcc_test(8, 3) \ - _BOOST_mingw_test(8, 2) \ - _BOOST_gcc_test(8, 2) \ - _BOOST_mingw_test(8, 1) \ - _BOOST_gcc_test(8, 1) \ - _BOOST_mingw_test(8, 0) \ - _BOOST_gcc_test(8, 0) \ - _BOOST_mingw_test(7, 3) \ - _BOOST_gcc_test(7, 3) \ - _BOOST_mingw_test(7, 2) \ - _BOOST_gcc_test(7, 2) \ - _BOOST_mingw_test(7, 1) \ - _BOOST_gcc_test(7, 1) \ - _BOOST_mingw_test(7, 0) \ - _BOOST_gcc_test(7, 0) \ - _BOOST_mingw_test(6, 4) \ - _BOOST_gcc_test(6, 4) \ - _BOOST_mingw_test(6, 3) \ - _BOOST_gcc_test(6, 3) \ - _BOOST_mingw_test(6, 2) \ - _BOOST_gcc_test(6, 2) \ - _BOOST_mingw_test(6, 1) \ - _BOOST_gcc_test(6, 1) \ - _BOOST_mingw_test(6, 0) \ - _BOOST_gcc_test(6, 0) \ - _BOOST_mingw_test(5, 5) \ - _BOOST_gcc_test(5, 5) \ - _BOOST_mingw_test(5, 4) \ - _BOOST_gcc_test(5, 4) \ - _BOOST_mingw_test(5, 3) \ - _BOOST_gcc_test(5, 3) \ - _BOOST_mingw_test(5, 2) \ - _BOOST_gcc_test(5, 2) \ - _BOOST_mingw_test(5, 1) \ - _BOOST_gcc_test(5, 1) \ - _BOOST_mingw_test(5, 0) \ - _BOOST_gcc_test(5, 0) \ - _BOOST_mingw_test(4, 10) \ - _BOOST_gcc_test(4, 10) \ - _BOOST_mingw_test(4, 9) \ - _BOOST_gcc_test(4, 9) \ - _BOOST_mingw_test(4, 8) \ - _BOOST_gcc_test(4, 8) \ - _BOOST_mingw_test(4, 7) \ - _BOOST_gcc_test(4, 7) \ - _BOOST_mingw_test(4, 6) \ - _BOOST_gcc_test(4, 6) \ - _BOOST_mingw_test(4, 5) \ - _BOOST_gcc_test(4, 5) \ - _BOOST_mingw_test(4, 4) \ - _BOOST_gcc_test(4, 4) \ - _BOOST_mingw_test(4, 3) \ - _BOOST_gcc_test(4, 3) \ - _BOOST_mingw_test(4, 2) \ - _BOOST_gcc_test(4, 2) \ - _BOOST_mingw_test(4, 1) \ - _BOOST_gcc_test(4, 1) \ - _BOOST_mingw_test(4, 0) \ - _BOOST_gcc_test(4, 0) \ - "defined __GNUC__ && __GNUC__ == 3 && !defined __ICC \ - && (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \ - || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw" \ - _BOOST_gcc_test(3, 4) \ - _BOOST_gcc_test(3, 3) \ - "defined _MSC_VER && _MSC_VER >= 1500 @ vc90" \ - "defined _MSC_VER && _MSC_VER == 1400 @ vc80" \ - _BOOST_gcc_test(3, 2) \ - "defined _MSC_VER && _MSC_VER == 1310 @ vc71" \ - _BOOST_gcc_test(3, 1) \ - _BOOST_gcc_test(3, 0) \ - "defined __BORLANDC__ @ bcb" \ - "defined __ICC && (defined __unix || defined __unix__) @ il" \ - "defined __ICL @ iw" \ - "defined _MSC_VER && _MSC_VER == 1300 @ vc7" \ - _BOOST_gcc_test(2, 95) \ - "defined __MWERKS__ && __MWERKS__ <= 0x32FF @ cw9" \ - "defined _MSC_VER && _MSC_VER < 1300 && !defined UNDER_CE @ vc6" \ - "defined _MSC_VER && _MSC_VER < 1300 && defined UNDER_CE @ evc4" \ - "defined __MWERKS__ && __MWERKS__ <= 0x31FF @ cw8" - do - boost_tag_test=`expr "X$i" : 'X\([[^@]]*\) @ '` - boost_tag=`expr "X$i" : 'X[[^@]]* @ \(.*\)'` - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#if $boost_tag_test -/* OK */ -#else -# error $boost_tag_test -#endif -]])], [boost_cv_lib_tag=$boost_tag; break], []) - done -AC_LANG_POP([C++])dnl - case $boost_cv_lib_tag in #( - # Some newer (>= 1.35?) versions of Boost seem to only use "gcc" as opposed - # to "gcc41" for instance. - *-gcc | *'-gcc ') :;; #( Don't re-add -gcc: it's already in there. - gcc*) - boost_tag_x= - case $host_os in #( - darwin*) - if test $boost_major_version -ge 136; then - # The `x' added in r46793 of Boost. - boost_tag_x=x - fi;; - esac - # We can specify multiple tags in this variable because it's used by - # BOOST_FIND_LIB that does a `for tag in -$boost_cv_lib_tag' ... - boost_cv_lib_tag="$boost_tag_x$boost_cv_lib_tag -${boost_tag_x}gcc" - ;; #( - unknown) - AC_MSG_WARN([[could not figure out which toolset name to use for $CXX]]) - boost_cv_lib_tag= - ;; - esac -fi])dnl end of AC_CACHE_CHECK -])# _BOOST_FIND_COMPILER_TAG - - -# _BOOST_GUESS_WHETHER_TO_USE_MT() -# -------------------------------- -# Compile a small test to try to guess whether we should favor MT (Multi -# Thread) flavors of Boost. Sets boost_guess_use_mt accordingly. -AC_DEFUN([_BOOST_GUESS_WHETHER_TO_USE_MT], -[# Check whether we do better use `mt' even though we weren't ask to. -AC_LANG_PUSH([C++])dnl -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#if defined _REENTRANT || defined _MT || defined __MT__ -/* use -mt */ -#else -# error MT not needed -#endif -]])], [boost_guess_use_mt=:], [boost_guess_use_mt=false]) -AC_LANG_POP([C++])dnl -]) - -# _BOOST_AC_LINK_IFELSE(PROGRAM, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) -# ------------------------------------------------------------------- -# Fork of _AC_LINK_IFELSE that preserves conftest.o across calls. Fragile, -# will break when Autoconf changes its internals. Requires that you manually -# rm -f conftest.$ac_objext in between to really different tests, otherwise -# you will try to link a conftest.o left behind by a previous test. -# Used to aggressively optimize BOOST_FIND_LIB (see the big comment in this -# macro). -# -# Don't use "break" in the actions, as it would short-circuit some code -# this macro runs after the actions. -m4_define([_BOOST_AC_LINK_IFELSE], -[m4_ifvaln([$1], [AC_LANG_CONFTEST([$1])])dnl -rm -f conftest$ac_exeext -boost_save_ac_ext=$ac_ext -boost_use_source=: -# If we already have a .o, re-use it. We change $ac_ext so that $ac_link -# tries to link the existing object file instead of compiling from source. -test -f conftest.$ac_objext && ac_ext=$ac_objext && boost_use_source=false && - _AS_ECHO_LOG([re-using the existing conftest.$ac_objext]) -AS_IF([_AC_DO_STDERR($ac_link) && { - test -z "$ac_[]_AC_LANG_ABBREV[]_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_executable_p conftest$ac_exeext -dnl FIXME: use AS_TEST_X instead when 2.61 is widespread enough. - }], - [$2], - [if $boost_use_source; then - _AC_MSG_LOG_CONFTEST - fi - $3]) -ac_objext=$boost_save_ac_objext -ac_ext=$boost_save_ac_ext -dnl Delete also the IPA/IPO (Inter Procedural Analysis/Optimization) -dnl information created by the PGI compiler (conftest_ipa8_conftest.oo), -dnl as it would interfere with the next link command. -rm -f core conftest.err conftest_ipa8_conftest.oo \ - conftest$ac_exeext m4_ifval([$1], [conftest.$ac_ext])[]dnl -])# _BOOST_AC_LINK_IFELSE - -# Local Variables: -# mode: autoconf -# End: diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 0ee7f18..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -bin_PROGRAMS = warp-sabre gentiles cleartiles clearbounds -warp_sabre_SOURCES = ImageWarpByFunc.cpp ImgMagick.cpp ReadDelimitedFile.cpp StringUtils.cpp Tile.cpp TransformPoly.cpp WarpOs.cpp WriteKml.cpp ganzc/LatLong-OSGBconversion.cpp gbos1936/Gbos1936.cpp -warp_sabre_CPPFLAGS = @MAGICKWAND_CFLAGS@ $(BOOST_CPPFLAGS) -warp_sabre_LDADD = @MAGICKWAND_LIBS@ $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_SYSTEM_LIBS) $(BOOST_FILESYSTEM_LIBS) -lnewmat -gentiles_SOURCES = CopyPixels.cpp GenTiles.cpp GetBounds.cpp ImageWarpByFunc.cpp ImgMagick.cpp ReadDelimitedFile.cpp ReadKmlFile.cpp StringUtils.cpp Tile.cpp gbos1936/Gbos1936.cpp -gentiles_CPPFLAGS = @MAGICKWAND_CFLAGS@ @LIBXML_CFLAGS@ $(BOOST_CPPFLAGS) -gentiles_LDADD = @MAGICKWAND_LIBS@ @LIBXML_LIBS@ $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_THREAD_LIBS) $(BOOST_FILESYSTEM_LIBS) $(BOOST_SYSTEM_LIBS) -cleartiles_SOURCES = ClearTiles.cpp GetBounds.cpp ImageWarpByFunc.cpp ImgMagick.cpp ReadDelimitedFile.cpp ReadKmlFile.cpp StringUtils.cpp Tile.cpp gbos1936/Gbos1936.cpp -cleartiles_CPPFLAGS = @MAGICKWAND_CFLAGS@ @LIBXML_CFLAGS@ $(BOOST_CPPFLAGS) -cleartiles_LDADD = @MAGICKWAND_LIBS@ @LIBXML_LIBS@ $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_FILESYSTEM_LIBS) $(BOOST_SYSTEM_LIBS) -clearbounds_SOURCES = ClearBounds.cpp CopyPixels.cpp GetBounds.cpp ImageWarpByFunc.cpp ImgMagick.cpp ReadDelimitedFile.cpp ReadKmlFile.cpp StringUtils.cpp Tile.cpp gbos1936/Gbos1936.cpp -clearbounds_CPPFLAGS = @MAGICKWAND_CFLAGS@ @LIBXML_CFLAGS@ $(BOOST_CPPFLAGS) -clearbounds_LDADD = @MAGICKWAND_LIBS@ @LIBXML_LIBS@ $(BOOST_PROGRAM_OPTIONS_LIBS) $(BOOST_SYSTEM_LIBS) $(BOOST_FILESYSTEM_LIBS) diff --git a/src/Makefile.old b/src/Makefile.old deleted file mode 100644 index 69de5fd..0000000 --- a/src/Makefile.old +++ /dev/null @@ -1,79 +0,0 @@ -CC = g++ -CPPFLAGS = -Wall -g #-D OLD_FFMPEG #-pg -LINK = -lX11 -lz -lpthread #-lexpat #-pg -CV_LIB = -lcv -lcvaux -lhighgui -INCLUDE = -I/opt/local/include -CV_INC = -I/usr/include/opencv -BUILD_DEPS = Stats.h -WARP_OBJ = Warp.o TransformPoly.o WriteKml.o ImageWarpByFunc.o ReadDelimitedFile.o StringUtils.o ganzc/LatLong-OSGBconversion.o gbos1936/Gbos1936.o ImgMagick.o -WARP_OS_OBJ = WarpOs.o TransformPoly.o WriteKml.o ImageWarpByFunc.o ReadDelimitedFile.o StringUtils.o ganzc/LatLong-OSGBconversion.o gbos1936/Gbos1936.o ImgMagick.o Tile.o -CLEAR_TILES_OBJ = ClearTiles.o gbos1936/Gbos1936.o StringUtils.o Tile.o ImgMagick.o ImageWarpByFunc.o ReadDelimitedFile.o ganzc/LatLong-OSGBconversion.o ReadKmlFile.o GetBounds.o -CLEAR_BOUNDS_OBJ = ClearBounds.o gbos1936/Gbos1936.o StringUtils.o Tile.o ImgMagick.o ReadDelimitedFile.o ReadKmlFile.o GetBounds.o CopyPixels.o -MAKE_WORLD_OBJ = MakeWorld.o ReadKmlFile.o ImgMagick.o Tile.o StringUtils.o -GEN_TILE_OBJ = GenTiles.o CopyPixels.o gbos1936/Gbos1936.o StringUtils.o Tile.o ImgMagick.o ImageWarpByFunc.o ReadDelimitedFile.o ganzc/LatLong-OSGBconversion.o ReadKmlFile.o GetBounds.o -MASK_RECTANGLE = MaskRectangle.o Gbos1936.o ganzc/LatLong-OSGBconversion.o ImgMagick.o -# Uncomment this next line for multi threaded tile generaton -#MT_FLAGS = -fopenmp -DUSE_MT_GENTILES -GM_INCLUDE = `GraphicsMagick++-config --cppflags --cxxflags --ldflags` -GM_LINK = `GraphicsMagick++-config --libs` -FFMPEG_LINK = -lavutil -lavformat -lavcodec -BOOST_LINK = -lboost_program_options-mt -lboost_system-mt -GTK_FLAGS = `pkg-config --cflags gtk+-2.0` -GTK_LIBS = `pkg-config --libs gtk+-2.0` -NEWMAT_LNK = -lnewmat -NEWMAT_INC = -Inewmat -NEWMAT_DEF = -Duse_namespace -AVCODEC_INC = `pkg-config --cflags libavcodec` -AVCODEC_LINK = `pkg-config --libs libavcodec` -AVFORMAT_INC = `pkg-config --cflags libavformat` -AVFORMAT_LINK = `pkg-config --libs libavformat` -SWSCALE_INC = `pkg-config --cflags swscale` -SWSCALE_LINK = `pkg-config --libs swscale` -MAGICKWAND_INC = `MagickWand-config --cflags --cppflags` -MAGICKWAND_LIB = `MagickWand-config --ldflags --libs` -LIBXML++_INC = -I/opt/local/include/libxml2 -LIBXML++_LIB = -lxml2 -MAGICK++_LIB = -lMagick++ -BOOST_FS = -lboost_filesystem-mt -BOOST_THREAD = -lboost_thread-mt -#If you can't compile with the higher accuracy OSTN02, available in Perl, comment out the next 4 lines. -#PERL_INC = -I/usr/lib/perl/5.10/CORE -#PERL_LIB = -lperl -#PERL_DEF = -DWITH_OSTN02_PERL -#PERL_OBJ = OSTN02Perl.o -#PERL_CONV = $(PERL_LIB) $(PERL_DEF) -#CONV = -DWITH_OSTN02_PYTHON -I/usr/include/python2.6 -lpython2.6 -#CONV_OBJ = PyOstn02.o - -#GraphicsMagick++-config --cppflags --cxxflags --ldflags --libs -all: warp gentiles cleartiles clearbounds makeworld -%.o : %.cpp - $(CC) -c $(CPPFLAGS) $(MT_FLAGS) $(INCLUDE) $(MAGICKWAND_INC) $(LIBXML++_INC) $(NEWMAT_DEF) $(CONV) $< -o $@ -cimg.gch: - $(CC) -c CImg/CImg.h -o cimg.gch - -warpxx: $(WARP_OBJ) - $(CC) $(WARP_OBJ) $(BOOST_LINK) $(MAGICKWAND_LIB) -lnewmat -lmorph -ICImg -lX11 $(CPPFLAGS) -lpthread -o $@ -warp: $(WARP_OS_OBJ) $(CONV_OBJ) - $(CC) $(WARP_OS_OBJ) $(CONV_OBJ) $(BOOST_LINK) $(MAGICKWAND_LIB) $(CONV) -lnewmat -lmorph -ICImg -lX11 $(CPPFLAGS) -lpthread -o $@ - : $(CLEAR_TILES_OBJ) $(CONV_OBJ) - $(CC) $(CLEAR_TILES_OBJ) $(CONV_OBJ) $(BOOST_LINK) $(MAGICKWAND_LIB) $(BOOST_FS) $(CONV) $(LIBXML++_LIB) -lX11 -lmorph $(CPPFLAGS) -lpthread -o $@ -gentiles: $(GEN_TILE_OBJ) $(CONV_OBJ) - $(CC) $(GEN_TILE_OBJ) $(CONV_OBJ) $(BOOST_LINK) $(MAGICKWAND_LIB) $(BOOST_FS) $(BOOST_THREAD) $(CONV) $(LIBXML++_LIB) -lX11 -lmorph $(CPPFLAGS) -lpthread -o $@ -clearbounds: $(CLEAR_BOUNDS_OBJ) $(CONV_OBJ) - $(CC) $(CLEAR_BOUNDS_OBJ) $(CONV_OBJ) $(BOOST_LINK) $(MAGICKWAND_LIB) $(BOOST_FS) $(CONV) $(LIBXML++_LIB) -lX11 -lmorph $(CPPFLAGS) -o $@ -makeworld: $(MAKE_WORLD_OBJ) - $(CC) $(MAKE_WORLD_OBJ) $(MAGICKWAND_LIB) $(LIBXML++_LIB) $(CPPFLAGS) -o $@ -maskrectangle: $(MASK_RECTANGLE) - $(CC) $(MASK_RECTANGLE) $(BOOST_LINK) $(MAGICKWAND_LIB) $(BOOST_FS) -lX11 -lmorph $(CPPFLAGS) -lpthread -o $@ -cleartiles: $(CLEAR_TILES_OBJ) - $(CC) $(CLEAR_TILES_OBJ) $(BOOST_LINK) $(MAGICKWAND_LIB) $(BOOST_FS) $(LIBXML++_LIB) -lX11 -lmorph $(CPPFLAGS) -lpthread -o $@ - -newmat/libnewmat.a: - cd newmat && make -f nm_gnu.mak - -clean: clean_prog - -clean_prog: - rm *.gch *~ *.o *.a warpxx *.png warp maskrectangle gentiles ganzc/*.o ganzc/*~ gbos1936/*.o gbos1936/*~ cleartiles - From 1fc1273e0840d705c71eec5a647af4521d183b57 Mon Sep 17 00:00:00 2001 From: Ritchie Swann Date: Thu, 16 May 2024 13:35:12 +0100 Subject: [PATCH 2/4] Multithreaded fixes Turn USE_MT_GENTILES on for compilation and log its use. Also fix typo in INSTALL instructions. --- CMakeLists.txt | 1 + INSTALL | 4 ++-- src/GenTiles.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b6062dc..a9a41a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED True) find_package(ImageMagick REQUIRED COMPONENTS Magick++) include_directories(${ImageMagick_INCLUDE_DIRS}) add_compile_options(${ImageMagick_COMPILE_OPTIONS}) +add_compile_options(-DUSE_MT_GENTILES) find_package(Boost REQUIRED COMPONENTS program_options filesystem system thread) diff --git a/INSTALL b/INSTALL index 6782688..dfd8a62 100644 --- a/INSTALL +++ b/INSTALL @@ -27,8 +27,8 @@ To build, type: mkdir build cd build -(for x64) cmake -DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES=/usr/local/include -DCMAKE_CXX_STANDARD_LIBRARIES=-L/usr/local/lib -(for arm64) cmake -DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES=/opt/homebrew/include -DCMAKE_CXX_STANDARD_LIBRARIES=-L/opt/homebrew/lib +(for x64) cmake -DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES=/usr/local/include -DCMAKE_CXX_STANDARD_LIBRARIES=-L/usr/local/lib .. +(for arm64) cmake -DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES=/opt/homebrew/include -DCMAKE_CXX_STANDARD_LIBRARIES=-L/opt/homebrew/lib .. make sudo make install diff --git a/src/GenTiles.cpp b/src/GenTiles.cpp index 17c3317..8c76ffa 100644 --- a/src/GenTiles.cpp +++ b/src/GenTiles.cpp @@ -829,7 +829,7 @@ int main(int argc, char ** argv) statusLock.lock(); int localThreadRunning = gThreadsRunning; statusLock.unlock(); - //cout << "threadsRunning: " << localThreadRunning << endl; + cout << "threadsRunning: " << localThreadRunning << endl; //Wait if we have enough running threads while (localThreadRunning >= targetNumThreads) From e93a66c515bd42fa5776afad7c65881c07a6ed65 Mon Sep 17 00:00:00 2001 From: Ritchie Swann Date: Fri, 17 May 2024 11:14:32 +0100 Subject: [PATCH 3/4] Refactoring for portability Removed boost filesystem and Magick++, as passing std::string across library boundaries in a pain in the neck to port reliably to multiple architectures. Replaced the former with direct methods and the latter with the latest MagickWand API. Also added some comments bits for Windows MinGW report, which need refactoring into the main CMake script --- CMakeLists.txt | 12 ++++++------ INSTALL | 17 +++++++++++++++++ configure.ac | 19 ------------------- src/ClearBounds.cpp | 5 ++++- src/ClearTiles.cpp | 13 ++++++------- src/GenTiles.cpp | 27 +++++++++++++------------- src/ImgMagick.cpp | 46 ++++++++++++++++++++++++++++++++------------- src/ImgMagick.h | 3 +++ src/ReadKmlFile.cpp | 2 +- src/StringUtils.cpp | 33 +++++++++++++++++++++++++------- src/StringUtils.h | 9 ++++++--- src/WarpOs.cpp | 6 +++++- 12 files changed, 121 insertions(+), 71 deletions(-) delete mode 100644 configure.ac diff --git a/CMakeLists.txt b/CMakeLists.txt index a9a41a9..0bc8ce6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,10 +6,14 @@ set(CMAKE_CXX_STANDARD_REQUIRED True) find_package(ImageMagick REQUIRED COMPONENTS Magick++) include_directories(${ImageMagick_INCLUDE_DIRS}) +execute_process(COMMAND Magick++-config --libs OUTPUT_VARIABLE ImageMagick_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE) add_compile_options(${ImageMagick_COMPILE_OPTIONS}) add_compile_options(-DUSE_MT_GENTILES) -find_package(Boost REQUIRED COMPONENTS program_options filesystem system thread) +find_package(Boost REQUIRED COMPONENTS program_options system thread) +find_package(LibXml2 REQUIRED) + +include_directories(${LIBXML2_INCLUDE_DIR}) add_executable(warp-sabre src/ImageWarpByFunc.cpp @@ -63,10 +67,9 @@ add_executable(clearbounds ) target_link_libraries(warp-sabre - PRIVATE ${ImageMagick_LIBRARIES} + PRIVATE ${ImageMagick_LIBRARIES} PRIVATE -lboost_program_options-mt PRIVATE -lboost_system-mt - PRIVATE -lboost_filesystem-mt PRIVATE -lmorph PRIVATE -lnewmat ) @@ -76,7 +79,6 @@ target_link_libraries(gentiles PRIVATE xml2 PRIVATE -lboost_program_options-mt PRIVATE -lboost_thread-mt - PRIVATE -lboost_filesystem-mt PRIVATE -lboost_system-mt PRIVATE -lmorph ) @@ -86,7 +88,6 @@ target_link_libraries(cleartiles PRIVATE xml2 PRIVATE -lboost_program_options-mt PRIVATE -lboost_thread-mt - PRIVATE -lboost_filesystem-mt PRIVATE -lboost_system-mt PRIVATE -lmorph ) @@ -96,7 +97,6 @@ target_link_libraries(clearbounds PRIVATE xml2 PRIVATE -lboost_program_options-mt PRIVATE -lboost_thread-mt - PRIVATE -lboost_filesystem-mt PRIVATE -lboost_system-mt PRIVATE -lmorph ) \ No newline at end of file diff --git a/INSTALL b/INSTALL index dfd8a62..bb033bb 100644 --- a/INSTALL +++ b/INSTALL @@ -32,3 +32,20 @@ cd build make sudo make install + +==Windows== +For Windows using mingw64 +pacman -S imagemagick boost +Newmat and Xormph must be compiled and installed manually + +Mingw64 doesn't play well with unix style file paths :-( + +To build, type: +mkdir build +cd build + +cmake \ + -DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES=/mingw64/include \ + -DCMAKE_CXX_STANDARD_LIBRARIES=-L/mingw64/lib \ + -DImageMagick_INCLUDE_DIRS=/mingw64/include/ImageMagick-7 \ + -DLIBXML2_INCLUDE_DIR=/mingw64/include/libxml2 .. \ No newline at end of file diff --git a/configure.ac b/configure.ac deleted file mode 100644 index c39be21..0000000 --- a/configure.ac +++ /dev/null @@ -1,19 +0,0 @@ -AC_INIT([warp],[1.02],[ritchieswann@gmail.com]) -AM_INIT_AUTOMAKE(subdir-objects) -AM_SILENT_RULES([yes]) -AC_CONFIG_MACRO_DIRS([m4]) -AC_PROG_CXX -PKG_CHECK_MODULES(MAGICKWAND,ImageMagick++,[],[AC_MSG_ERROR([Unable to find ImageMagick++])]) -PKG_CHECK_MODULES(LIBXML,libxml-2.0,[],[AC_MSG_ERROR([Unable to find libxml])]) -LT_INIT -BOOST_REQUIRE -BOOST_FILESYSTEM -BOOST_PROGRAM_OPTIONS -BOOST_SYSTEM -BOOST_THREAD -AC_LANG_PUSH([C++]) -AC_CHECK_LIB(morph, warp_image_a_m, [], [AC_MSG_ERROR([Unable to find libmorph])]) -AC_CHECK_HEADER(newmat/newmat.h, [], [AC_MSG_ERROR([Unable to find newmat])]) -AC_LANG_POP([C++]) -AC_CONFIG_FILES(Makefile src/Makefile) -AC_OUTPUT diff --git a/src/ClearBounds.cpp b/src/ClearBounds.cpp index fff90d5..960c84d 100644 --- a/src/ClearBounds.cpp +++ b/src/ClearBounds.cpp @@ -19,7 +19,7 @@ void ClearImage( const string& srcFilename, DelimitedFile& boundsFile, const int cout << "Source file '" << srcFilename << "'" << endl; string imgFilename; int ret = ReadKmlFile( srcFilename.c_str(), srcKml.tile, imgFilename ); - srcKml.imgFilename = GetFilePath( srcFilename ); + srcKml.imgFilename = GetFilePath( srcFilename.c_str() ); srcKml.imgFilename += "/"; srcKml.imgFilename += imgFilename; if( ret < 1 ) { @@ -62,6 +62,8 @@ void ClearImage( const string& srcFilename, DelimitedFile& boundsFile, const int int main( int argc, char* argv[]) { + ImgMagick::Init(); + vector src; DelimitedFile boundsFile; @@ -117,5 +119,6 @@ int main( int argc, char* argv[]) ClearImage( *it, boundsFile, edge ); } } + ImgMagick::Term(); return 1; } diff --git a/src/ClearTiles.cpp b/src/ClearTiles.cpp index 83d0d1c..7ab3ac0 100644 --- a/src/ClearTiles.cpp +++ b/src/ClearTiles.cpp @@ -20,9 +20,6 @@ namespace po = boost::program_options; //rsync --size-only -v -r /var/www/os7 timsc@dev.openstreetmap.org:/home/ooc //rsync --size-only -v -r /var/www/openlayers/os7 timsc@dev.openstreetmap.org:/home/timsc/public_html/openlayers -#include // includes all needed Boost.Filesystem declarations -namespace fs = boost::filesystem; - #include #include #include @@ -58,7 +55,7 @@ void DrawMarker(class ImgMagick &img, double x, double y) int main(int argc, char ** argv) { - + ImgMagick::Init(); //Image imageInOut("step.jpg"); //imageInOut.crop( Geometry(255,255,0,0) ); @@ -122,7 +119,7 @@ int main(int argc, char ** argv) { class SourceKml temp; cout << "Source file '" << inputFiles[i] << "'" << endl; - string filePath = GetFilePath(inputFiles[i]); + string filePath = GetFilePath(inputFiles[i].c_str()); src.push_back(temp); class SourceKml &last = src[src.size()-1]; @@ -203,14 +200,16 @@ int main(int argc, char ** argv) outFilename += IntToString(tileLat); outFilename += ".jpg"; - if ( fs::exists( outFilename )) + if ( fileExists( outFilename.c_str() )) { cout << "Deleting: " << outFilename << endl; - fs::remove(outFilename); + remove(outFilename.c_str()); } } //End of tile loop } //End of zoom loop + + ImgMagick::Term(); } diff --git a/src/GenTiles.cpp b/src/GenTiles.cpp index 8c76ffa..85f3f8b 100644 --- a/src/GenTiles.cpp +++ b/src/GenTiles.cpp @@ -11,6 +11,7 @@ #include "GetBounds.h" #include "CopyPixels.h" #include "SourceKml.h" +#include #include #include #include @@ -24,9 +25,6 @@ namespace po = boost::program_options; //rsync --size-only -v -r /var/www/os7 timsc@dev.openstreetmap.org:/home/ooc //rsync --size-only -v -r /var/www/openlayers/os7 timsc@dev.openstreetmap.org:/home/timsc/public_html/openlayers -#include // includes all needed Boost.Filesystem declarations -namespace fs = boost::filesystem; - #include #include #include @@ -419,14 +417,14 @@ int TileJob::Render() //outImg = tile; - if ( !fs::exists( this->outFolder0 ) ) - fs::create_directory( this->outFolder0 ); + if ( !dirExists( this->outFolder0.c_str() ) ) + mkdir( this->outFolder0.c_str(), S_IRWXU ); - if ( !fs::exists( this->outFolder1 ) ) - fs::create_directory( this->outFolder1 ); + if ( !dirExists( this->outFolder1.c_str() ) ) + mkdir( this->outFolder1.c_str(), S_IRWXU ); - if ( !fs::exists( this->outFolder2 ) ) - fs::create_directory( this->outFolder2 ); + if ( !dirExists( this->outFolder2.c_str() ) ) + mkdir( this->outFolder2.c_str(), S_IRWXU ); outImg.Save(this->outFilename.c_str()); //temp.syncPixels(); @@ -446,6 +444,8 @@ int main(int argc, char ** argv) __g_argv = argv; + ImgMagick::Init(); + //Image imageInOut("step.jpg"); //imageInOut.crop( Geometry(255,255,0,0) ); //imageInOut.write("test2.png"); @@ -543,7 +543,7 @@ int main(int argc, char ** argv) { class SourceKml temp; cout << "Source file '" << inputFiles[i] << "'" << endl; - string filePath = GetFilePath(inputFiles[i]); + string filePath = GetFilePath(inputFiles[i].c_str()); src.push_back(temp); class SourceKml &last = src[src.size()-1]; @@ -610,8 +610,7 @@ int main(int argc, char ** argv) for(unsigned int t=0;t::iterator it = zoomLimitMax.find(chkStr); if(it!=zoomLimitMax.end()) @@ -651,7 +650,7 @@ int main(int argc, char ** argv) outFilename += ".jpg"; int skipExistingTiles = 1; - if ( fs::exists( outFilename ) && skipExistingTiles) + if ( fileExists( outFilename.c_str() ) && skipExistingTiles) { cout << "Already exists: " << outFilename << endl; continue; @@ -881,5 +880,7 @@ int main(int argc, char ** argv) if(job.originalObj->failed) countFail ++; } cout << "Number of tiles failed: " << countFail << endl; + + ImgMagick::Term(); } diff --git a/src/ImgMagick.cpp b/src/ImgMagick.cpp index d360cde..5db491e 100644 --- a/src/ImgMagick.cpp +++ b/src/ImgMagick.cpp @@ -1,15 +1,23 @@ #include "ImgMagick.h" -#include -#include +#include #include #include using namespace std; -using namespace Magick; + +void ImgMagick::Init() +{ + MagickWandGenesis(); +} + +void ImgMagick::Term() +{ + MagickWandTerminus(); +} ImgMagick::ImgMagick() { - InitializeMagick( NULL ); + raw = 0; height = 0; width = 0; @@ -52,15 +60,21 @@ int ImgMagick::Open(const char *filename) Close(); - Image image; - image.read( filename ); - - width = image.columns(); - height = image.rows(); + MagickWand *wand = NewMagickWand(); + //Open File + FILE *imgFile = fopen(filename,"r"); + if(!imgFile) return -1; + MagickBooleanType ret = MagickReadImageFile(wand,imgFile); + fclose(imgFile); + if(!ret) return -1; + + width = MagickGetImageWidth(wand); + height = MagickGetImageHeight(wand); channels = 3; - raw = new unsigned char[width*height*channels]; - image.write( 0, 0, width, height, "RGB", CharPixel, raw ); + raw = new unsigned char[width*height*channels]; + MagickExportImagePixels(wand,0,0,width,height,"RGB",CharPixel,raw); + ClearMagickWand(wand); return 1; } @@ -68,8 +82,14 @@ int ImgMagick::Save(const char *filename) { if(!raw) return -1; - Image image( width, height, "RGB", CharPixel, raw ); - image.write( filename ); + MagickWand *wand = NewMagickWand(); + MagickConstituteImage(wand, + width,height,"RGB", + CharPixel,raw); + + //Save and clean up + MagickWriteImage(wand, filename); + ClearMagickWand(wand); return 1; } diff --git a/src/ImgMagick.h b/src/ImgMagick.h index 4af259a..ab04f2e 100644 --- a/src/ImgMagick.h +++ b/src/ImgMagick.h @@ -35,6 +35,9 @@ class ImgMagick : public ImgFrameBase virtual int GetInternalImageType() const; virtual const void *GetInternalDataConst() const; + static void Init(); + static void Term(); + protected: unsigned char *raw; int height; diff --git a/src/ReadKmlFile.cpp b/src/ReadKmlFile.cpp index 74e0b66..e5267ae 100644 --- a/src/ReadKmlFile.cpp +++ b/src/ReadKmlFile.cpp @@ -157,7 +157,7 @@ int ReadKmlFile(const char *filename, class Tile &tileOut, string &imgFilenameOu vector empty; processKml.ProcessNode(pNode, empty); - imgFilenameOut = RemoveFilePath( processKml.imgFilename ); + imgFilenameOut = RemoveFilePath( processKml.imgFilename.c_str() ); tileOut = processKml.tile; xmlFreeDoc( doc ); diff --git a/src/StringUtils.cpp b/src/StringUtils.cpp index c93fcf2..dee5c12 100644 --- a/src/StringUtils.cpp +++ b/src/StringUtils.cpp @@ -6,7 +6,7 @@ #include #include #include "StringUtils.h" -#include +#include string PackBeforeString(string baseString, string pack, int minLength) { @@ -204,16 +204,20 @@ string RemoveFileExtension(string filename) return filename.substr(0, extensionOffset); } -string RemoveFilePath(string filename) +string RemoveFilePath(const char* filename) { - boost::filesystem::path p( filename ); - return p.filename().string(); + std::string s( filename ); + std::string result = s.substr( s.find_last_of("/\\") + 1); + //std::cout << filename << " RemoveFilePath " << result << endl; + return result; } -string GetFilePath(string filename) +string GetFilePath(const char* filename) { - boost::filesystem::path p( filename ); - return p.parent_path().string(); + std::string s( filename ); + std::string result = s.substr(0, s.find_last_of("/\\")); + //std::cout << filename << " GetFilePath " << result << endl; + return result; } string FilenameChangeNumber(string filename, int num) @@ -364,3 +368,18 @@ string UnescapeCommas(string input) return ReplaceAllInstances(input,"\\,",","); } +int dirExists( const char* path ) +{ + struct stat info; + return( stat( path, &info ) == 0 ); +} + +int fileExists( const char* path ) +{ + if (FILE *file = fopen(path, "r")) { + fclose(file); + return true; + } else { + return false; + } +} \ No newline at end of file diff --git a/src/StringUtils.h b/src/StringUtils.h index 90c501f..d74ca45 100644 --- a/src/StringUtils.h +++ b/src/StringUtils.h @@ -17,9 +17,9 @@ string RemoveWhitespace(string str); string FilenameRemoveFrameNumAndExtension(string filename); string FilenameChangeNumber(string filename, int num); string GetFileExtension(string filename); -string RemoveFileExtension(string filename); -string RemoveFilePath(string filename); -string GetFilePath(string filename); +string RemoveFileExtension(const char* filename); +string RemoveFilePath(const char* filename); +string GetFilePath(const char* filename); int GetFileAsString(const char *filename, string &dataOut); vector SplitString(string in, string token); @@ -27,6 +27,9 @@ string ReplaceAllInstances(string input, string findStr, string replaceString); string EscapeCommas(string input); string UnescapeCommas(string input); +int dirExists( const char* path ); +int fileExists( const char* path ); + template string ToString(T input) { ostringstream out; diff --git a/src/WarpOs.cpp b/src/WarpOs.cpp index 6efbe33..4237deb 100644 --- a/src/WarpOs.cpp +++ b/src/WarpOs.cpp @@ -194,6 +194,8 @@ int main(int argc, char *argv[]) string inproj = "gbos"; vector corners; + ImgMagick::Init(); + //Print name of transform to screen char transformName[100]; gConverter.GetTransformName(transformName, 100); @@ -627,7 +629,7 @@ int main(int argc, char *argv[]) endImage.Save(mapOutFilename.c_str()); string mapOutFileNoPath; //Don't save the path into the kml output - mapOutFileNoPath = RemoveFilePath(mapOutFilename); + mapOutFileNoPath = RemoveFilePath(mapOutFilename.c_str()); if (mercatorOut) { @@ -641,4 +643,6 @@ int main(int argc, char *argv[]) cout << "Writing KML to " << kmlOutFilename << endl; writeKml.WriteToFile(kmlOutFilename.c_str()); } + + ImgMagick::Term(); } From 446d8c10fb89e77a656107d62c520b78a4da2db6 Mon Sep 17 00:00:00 2001 From: Ritchie Swann Date: Fri, 17 May 2024 11:39:33 +0100 Subject: [PATCH 4/4] Minor tweaks Change required version to 3.15 (older Debian distros still use this) Change requirement from Magick++-config to Magickwand-config (as the older C API is being used as it plays nicer with MinGW) --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0bc8ce6..123f90c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.29) +cmake_minimum_required(VERSION 3.15) project(warp-sabre LANGUAGES CXX) set(CMAKE_CXX_STANDARD 11) @@ -6,7 +6,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED True) find_package(ImageMagick REQUIRED COMPONENTS Magick++) include_directories(${ImageMagick_INCLUDE_DIRS}) -execute_process(COMMAND Magick++-config --libs OUTPUT_VARIABLE ImageMagick_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE) +execute_process(COMMAND Magickwand-config --libs OUTPUT_VARIABLE ImageMagick_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE) add_compile_options(${ImageMagick_COMPILE_OPTIONS}) add_compile_options(-DUSE_MT_GENTILES)