From b8ca53198795afc4065ce2d989c93a3dc7ed3e64 Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Mon, 16 Jan 2017 15:22:39 +0100 Subject: [PATCH] Added patch to omptl to make everything work together --- external/external_build.cmake | 1 + external/patch-omptl | 94 +++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 external/patch-omptl diff --git a/external/external_build.cmake b/external/external_build.cmake index 184cf30..e7b3aca 100644 --- a/external/external_build.cmake +++ b/external/external_build.cmake @@ -266,6 +266,7 @@ ExternalProject_Add(omptl URL ${CMAKE_SOURCE_DIR}/external/omptl-20120422.tar.bz2 CONFIGURE_COMMAND echo "No configure" BUILD_COMMAND echo "No build" + PATCH_COMMAND patch -p1 -t -N < ${CMAKE_SOURCE_DIR}/external/patch-omptl INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory ${OMPTL_BUILD_DIR} ${EXT_INSTALL}/include/omptl ) include_directories(${EXT_INSTALL}/include) diff --git a/external/patch-omptl b/external/patch-omptl new file mode 100644 index 0000000..f9b2e6d --- /dev/null +++ b/external/patch-omptl @@ -0,0 +1,94 @@ +diff -ur omptl.orig/omptl_algorithm omptl/omptl_algorithm +--- omptl.orig/omptl_algorithm 2017-01-16 14:58:37.996690639 +0100 ++++ omptl/omptl_algorithm 2017-01-16 15:00:26.678641720 +0100 +@@ -20,7 +20,7 @@ + #define OMPTL_ALGORITHM 1 + + #include +-#include ++#include "omptl" + + namespace omptl + { +@@ -553,9 +553,9 @@ + } // namespace omptl + + #ifdef _OPENMP +- #include ++ #include "omptl_algorithm_par.h" + #else +- #include ++ #include "omptl_algorithm_ser.h" + #endif + + #endif /* OMPTL_ALGORITHM */ +diff -ur omptl.orig/omptl_algorithm_par.h omptl/omptl_algorithm_par.h +--- omptl.orig/omptl_algorithm_par.h 2017-01-16 14:58:37.996690639 +0100 ++++ omptl/omptl_algorithm_par.h 2017-01-16 14:59:57.974126410 +0100 +@@ -21,8 +21,8 @@ + #include + #include + +-#include +-#include ++#include "omptl_tools.h" ++#include "omptl_numeric" + + #include + +diff -ur omptl.orig/omptl_numeric omptl/omptl_numeric +--- omptl.orig/omptl_numeric 2017-01-16 14:58:37.996690639 +0100 ++++ omptl/omptl_numeric 2017-01-16 15:00:57.051186974 +0100 +@@ -19,7 +19,7 @@ + #define OMPTL_NUMERIC 1 + + #include +-#include ++#include "omptl" + + namespace omptl + { +@@ -73,11 +73,11 @@ + } // namespace omptl + + #ifdef _OPENMP +- #include ++ #include "omptl_numeric_par.h" + #else +- #include ++ #include "omptl_numeric_ser.h" + #endif + +-#include ++#include "omptl_numeric_extensions.h" + + #endif /* OMPTL_NUMERIC */ +diff -ur omptl.orig/omptl_numeric_extensions.h omptl/omptl_numeric_extensions.h +--- omptl.orig/omptl_numeric_extensions.h 2017-01-16 14:58:37.996690639 +0100 ++++ omptl/omptl_numeric_extensions.h 2017-01-16 14:59:21.549472508 +0100 +@@ -51,9 +51,9 @@ + } // namespace + + #ifdef _OPENMP +- #include ++ #include "omptl_numeric_extensions_par.h" + #else +- #include ++ #include "omptl_numeric_extensions_ser.h" + #endif + + namespace omptl +diff -ur omptl.orig/omptl_numeric_par.h omptl/omptl_numeric_par.h +--- omptl.orig/omptl_numeric_par.h 2017-01-16 14:58:37.996690639 +0100 ++++ omptl/omptl_numeric_par.h 2017-01-16 14:59:36.397739066 +0100 +@@ -23,8 +23,8 @@ + #include + #include + +-#include +-#include ++#include "omptl_algorithm" ++#include "omptl_tools.h" + + namespace omptl + {