Cmake simplification and various other minor changes

cmake/FindAPEX.cmake

@@ -0,0 +1,46 @@
+# Copyright (c)      2014 Thomas Heller
+# Copyright (c) 2007-2011 Hartmut Kaiser
+# Copyright (c) 2011      Bryce Lelbach
+# Copyright (c) 2011      Maciej Brodowicz
+#
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+find_package(PkgConfig)
+pkg_check_modules(PC_APEX QUIET APEX)
+
+# This if statement is specific to APEX, and should not be copied into other
+# Find cmake scripts.
+if(NOT APEX_ROOT AND NOT $ENV{HOME_APEX} STREQUAL "")
+  set(APEX_ROOT "$ENV{HOME_APEX}")
+endif()
+
+find_path(APEX_INCLUDE_DIR apex.hpp
+  HINTS
+    ${APEX_ROOT} ENV APEX_ROOT
+    ${PC_APEX_INCLUDEDIR}
+    ${PC_APEX_INCLUDE_DIRS}
+  PATH_SUFFIXES include)
+
+find_library(APEX_LIBRARY NAMES Apex libApex
+  HINTS
+    ${APEX_ROOT} ENV APEX_ROOT
+    ${PC_APEX_LIBDIR}
+    ${PC_APEX_LIBRARY_DIRS}
+  PATH_SUFFIXES lib lib64)
+
+set(APEX_LIBRARIES ${APEX_LIBRARY})
+set(APEX_INCLUDE_DIRS ${APEX_INCLUDE_DIR})
+
+find_package_handle_standard_args(APEX DEFAULT_MSG
+  APEX_LIBRARY APEX_INCLUDE_DIR)
+
+get_property(_type CACHE APEX_ROOT PROPERTY TYPE)
+if(_type)
+  set_property(CACHE APEX_ROOT PROPERTY ADVANCED 1)
+  if("x${_type}" STREQUAL "xUNINITIALIZED")
+    set_property(CACHE APEX_ROOT PROPERTY TYPE PATH)
+  endif()
+endif()
+
+mark_as_advanced(APEX_ROOT APEX_LIBRARY APEX_INCLUDE_DIR)

cmake/FindAmplifier.cmake

@@ -0,0 +1,38 @@
+# Copyright (c) 2014 Thomas Heller
+# Copyright (c) 2012 Hartmut Kaiser
+#
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+find_package(PkgConfig)
+pkg_check_modules(PC_AMPLIFIER QUIET amplifier)
+
+find_path(AMPLIFIER_INCLUDE_DIR ittnotify.h
+  HINTS
+    ${AMPLIFIER_ROOT} ENV AMPLIFIER_ROOT
+    ${PC_AMPLIFIER_INCLUDEDIR}
+    ${PC_AMPLIFIER_INCLUDE_DIRS}
+  PATH_SUFFIXES include)
+
+find_library(AMPLIFIER_LIBRARY NAMES ittnotify libittnotify
+  HINTS
+    ${AMPLIFIER_ROOT} ENV AMPLIFIER_ROOT
+    ${PC_AMPLIFIER_LIBDIR}
+    ${PC_AMPLIFIER_LIBRARY_DIRS}
+  PATH_SUFFIXES lib lib64)
+
+set(AMPLIFIER_LIBRARIES ${AMPLIFIER_LIBRARY})
+set(AMPLIFIER_INCLUDE_DIRS ${AMPLIFIER_INCLUDE_DIR})
+
+find_package_handle_standard_args(Amplifier DEFAULT_MSG
+  AMPLIFIER_LIBRARY AMPLIFIER_INCLUDE_DIR)
+
+get_property(_type CACHE AMPLIFIER_ROOT PROPERTY TYPE)
+if(_type)
+  set_property(CACHE AMPLIFIER_ROOT PROPERTY ADVANCED 1)
+  if("x${_type}" STREQUAL "xUNINITIALIZED")
+    set_property(CACHE AMPLIFIER_ROOT PROPERTY TYPE PATH)
+  endif()
+endif()
+
+mark_as_advanced(AMPLIFIER_ROOT AMPLIFIER_LIBRARY AMPLIFIER_INCLUDE_DIR)

cmake/FindBZip2.cmake

@@ -0,0 +1,56 @@
+# - Try to find BZip2
+# Once done this will define
+#
+#  BZIP2_FOUND - system has BZip2
+#  BZIP2_INCLUDE_DIR - the BZip2 include directory
+#  BZIP2_LIBRARIES - Link these to use BZip2
+#  BZIP2_NEED_PREFIX - this is set if the functions are prefixed with BZ2_
+#  BZIP2_VERSION_STRING - the version of BZip2 found (since CMake 2.8.8)
+
+#=============================================================================
+# Copyright 2006-2012 Kitware, Inc.
+# Copyright 2006 Alexander Neundorf <neundorf@kde.org>
+# Copyright 2012 Rolf Eike Beer <eike@sf-mail.de>
+#
+# 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.)
+
+set(_BZIP2_PATHS PATHS
+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Bzip2;InstallPath]"
+  )
+
+find_path(BZIP2_INCLUDE_DIR bzlib.h ${_BZIP2_PATHS} PATH_SUFFIXES include)
+
+if (NOT BZIP2_LIBRARIES)
+    find_library(BZIP2_LIBRARY_RELEASE NAMES bz2 bzip2 ${_BZIP2_PATHS} PATH_SUFFIXES lib)
+    find_library(BZIP2_LIBRARY_DEBUG NAMES bzip2d ${_BZIP2_PATHS} PATH_SUFFIXES lib)
+
+    include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
+    SELECT_LIBRARY_CONFIGURATIONS(BZIP2)
+endif ()
+
+if (BZIP2_INCLUDE_DIR AND EXISTS "${BZIP2_INCLUDE_DIR}/bzlib.h")
+    file(STRINGS "${BZIP2_INCLUDE_DIR}/bzlib.h" BZLIB_H REGEX "bzip2/libbzip2 version [0-9]+\\.[^ ]+ of [0-9]+ ")
+    string(REGEX REPLACE ".* bzip2/libbzip2 version ([0-9]+\\.[^ ]+) of [0-9]+ .*" "\\1" BZIP2_VERSION_STRING "${BZLIB_H}")
+endif ()
+
+# handle the QUIETLY and REQUIRED arguments and set BZip2_FOUND to TRUE if
+# all listed variables are TRUE
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(BZip2
+                                  REQUIRED_VARS BZIP2_LIBRARIES BZIP2_INCLUDE_DIR
+                                  VERSION_VAR BZIP2_VERSION_STRING)
+
+if (BZIP2_FOUND)
+   include(${CMAKE_CURRENT_LIST_DIR}/CheckLibraryExists.cmake)
+   CHECK_LIBRARY_EXISTS("${BZIP2_LIBRARIES}" BZ2_bzCompressInit "" BZIP2_NEED_PREFIX)
+endif ()
+
+mark_as_advanced(BZIP2_INCLUDE_DIR)

cmake/FindBoostAutoIndex.cmake

@@ -0,0 +1,18 @@
+# Copyright (c)      2014 Thomas Heller
+#
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+find_program(BOOSTAUTOINDEX_EXECUTABLE
+  auto_index
+  PATHS
+    ${CMAKE_SYSTEM_PREFIX_PATH}
+    ${BOOST_ROOT}
+    ${BOOSTAUTOINDEX_ROOT}
+    ENV BOOST_ROOT ENV BOOSTQUICKBOOK_ROOT
+  PATH_SUFFIXES bin dist/bin)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(BoostAutoIndex
+  REQUIRED_VARS BOOSTAUTOINDEX_EXECUTABLE
+  )

cmake/FindBoostQuickBook.cmake

@@ -0,0 +1,24 @@
+# Copyright (c)      2014 Thomas Heller
+# Copyright (c) 2011-2012 Bryce Adelstein-Lelbach
+#
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+find_program(BOOSTQUICKBOOK_EXECUTABLE
+  quickbook
+  PATHS
+    ${CMAKE_SYSTEM_PREFIX_PATH}
+    ${BOOST_ROOT}
+    ${BOOSTQUICKBOOK_ROOT}
+    ENV BOOST_ROOT ENV BOOSTQUICKBOOK_ROOT
+  PATH_SUFFIXES bin dist/bin)
+
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(BoostQuickBook
+  REQUIRED_VARS BOOSTQUICKBOOK_EXECUTABLE
+)
+
+if(BOOSTQUICKBOOK_EXECUTABLE)
+  set(BOOSTQUICKBOOK_FOUND TRUE)
+endif()

cmake/FindBoostWave.cmake

@@ -0,0 +1,24 @@
+# Copyright (c) 2011 Bryce Lelbach
+# Copyright (c) 2012-2014 Thomas Heller
+#
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+find_program(BOOSTWAVE_EXECUTABLE
+  wave
+  PATHS
+    ${CMAKE_SYSTEM_PREFIX_PATH}
+    ${BOOST_ROOT}
+    ${BOOSTWAVE_ROOT}
+    ENV BOOST_ROOT ENV BOOSTWAVE_ROOT
+  PATH_SUFFIXES bin dist/bin)
+
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(BoostWave
+  REQUIRED_VARS BOOSTWAVE_EXECUTABLE
+)
+
+if(BOOSTWAVE_EXECUTABLE)
+  set(BOOSTWAVE_FOUND TRUE)
+endif()

cmake/FindDocBook.cmake

@@ -0,0 +1,27 @@
+# Copyright (c) 2014 Thomas Heller
+# Copyright (c) 2011 Bryce Lelbach
+#
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+find_path(DOCBOOK_DTD
+  docbookx.dtd
+  PATHS ${CMAKE_SYSTEM_PREFIX_PATH} ${DOCBOOK_ROOT} ENV DOCBOOK_ROOT
+  PATH_SUFFIXES
+    share/xml/docbook/schema/dtd/4.2
+    docbook-dtd
+    share/sgml/docbook/xml-dtd-4.2)
+
+find_path(DOCBOOK_XSL
+  NAMES html/html.xsl xhtml-1_1/html.xsl
+  PATHS ${CMAKE_SYSTEM_PREFIX_PATH} ${DOCBOOK_ROOT} ENV DOCBOOK_ROOT
+  PATH_SUFFIXES
+      share/xml/docbook/stylesheet/docbook-xsl
+      docbook-xsl
+      share/sgml/docbook/xsl-stylesheets)
+
+if(DOCBOOK_DTD AND DOCBOOK_XSL)
+  set(DOCBOOK_FOUND TRUE)
+endif()
+
+mark_as_advanced(DOCBOOK_DTD DOCBOOK_XSL)

cmake/FindFOP.cmake

@@ -0,0 +1,19 @@
+# Copyright (c) 2014 Thomas Heller
+#
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+find_program(FOP_EXECUTABLE
+  NAMES
+    fop
+    xep.bat
+  PATHS
+    $ENV{PROGRAMFILES}/RenderX/XEP
+    ${FOP_ROOT}
+    ENV FOP_ROOT
+  DOC
+    "An XSL-FO processor"
+  )
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(FOP DEFAULT_MSG FOP_EXECUTABLE)

cmake/FindGooglePerftools.cmake

@@ -0,0 +1,53 @@
+# - Try to find GooglePerftools
+# Once done this will define
+#  GOOGLE_PERFTOOLS_FOUND - System has GooglePerftools
+#  GOOGLE_PERFTOOLS_INCLUDE_DIRS - The GooglePerftools include directory
+#  GOOGLE_PERFTOOLS_LIBRARIES - Link these to use GooglePerftools
+
+# Copyright (c)      2014 Thomas Heller
+# Copyright (c) 2007-2012 Hartmut Kaiser
+# Copyright (c) 2010-2011 Matt Anderson
+# Copyright (c) 2011      Bryce Lelbach
+#
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+find_package(PkgConfig)
+pkg_check_modules(PC_GOOGLE_PERFTOOLS QUIET libprofiler)
+
+find_path(GOOGLE_PERFTOOLS_INCLUDE_DIR google/profiler.h
+  HINTS
+    ${GOOGLE_PERFTOOLS_ROOT} ENV GOOGLE_PERFTOOLS_ROOT
+    ${PC_GOOGLE_PERFTOOLS_INCLUDEDIR}
+    ${PC_GOOGLE_PERFTOOLS_INCLUDE_DIRS}
+  PATH_SUFFIXES include)
+
+find_library(GOOGLE_PERFTOOLS_LIBRARY NAMES profiler libprofiler
+  HINTS
+    ${GOOGLE_PERFTOOLS_ROOT} ENV GOOGLE_PERFTOOLS_ROOT
+    ${PC_GOOGLE_PERFTOOLS_LIBDIR}
+    ${PC_GOOGLE_PERFTOOLS_LIBRARY_DIRS}
+  PATH_SUFFIXES lib lib64)
+
+set(GOOGLE_PERFTOOLS_LIBRARIES ${GOOGLE_PERFTOOLS_LIBRARY})
+set(GOOGLE_PERFTOOLS_INCLUDE_DIRS ${GOOGLE_PERFTOOLS_INCLUDE_DIR})
+
+find_package_handle_standard_args(GooglePerftools DEFAULT_MSG
+  GOOGLE_PERFTOOLS_LIBRARY GOOGLE_PERFTOOLS_INCLUDE_DIR)
+
+get_property(_type CACHE GOOGLE_PERFTOOLS_ROOT PROPERTY TYPE)
+if(_type)
+  set_property(CACHE GOOGLE_PERFTOOLS_ROOT PROPERTY ADVANCED 1)
+  if("x${_type}" STREQUAL "xUNINITIALIZED")
+    set_property(CACHE GOOGLE_PERFTOOLS_ROOT PROPERTY TYPE PATH)
+  endif()
+endif()
+
+if(NOT GOOGLEPERFTOOLS_FOUND)
+  hpx_info("    Set GOOGLE_PERFTOOLS_ROOT to the location where the gperftools are installed\n")
+endif()
+
+set(GOOGLE_PERFTOOLS_FOUND ${GOOGLEPERFTOOLS_FOUND})
+unset(GOOGLEPERFTOOLS_FOUND)
+
+mark_as_advanced(GOOGLE_PERFTOOLS_ROOT GOOGLE_PERFTOOLS_LIBRARY GOOGLE_PERFTOOLS_INCLUDE_DIR)

cmake/FindHPX_BLAS.cmake

@@ -3,13 +3,9 @@
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-if(NOT HPX_FINDPACKAGE_LOADED)
-  include(HPX_FindPackage)
-endif()
-
 hpx_find_package(BLAS
   LIBRARIES blas libblas
-  LIBRARY_PATHS lib64 lib 
+  LIBRARY_PATHS lib64 lib
   HEADERS cblas.h
   HEADER_PATHS include)