guilhem_lavaux/cosmotool
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added patch to omptl to make everything work together

Browse Source
This commit is contained in:
Guilhem Lavaux 2017-01-16 15:22:39 +01:00
parent f0d9fb1625
commit b8ca531987
2 changed files with 95 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
external/external_build.cmake vendored
View File

@ -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)

94
external/patch-omptl vendored Normal file
View File

@ -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 <algorithm>
-#include <omptl/omptl>
+#include "omptl"
namespace omptl
{
@@ -553,9 +553,9 @@
} // namespace omptl
#ifdef _OPENMP
- #include <omptl/omptl_algorithm_par.h>
+ #include "omptl_algorithm_par.h"
#else
- #include <omptl/omptl_algorithm_ser.h>
+ #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 <cmath>
#include <cstdlib>
-#include <omptl/omptl_tools.h>
-#include <omptl/omptl_numeric>
+#include "omptl_tools.h"
+#include "omptl_numeric"
#include <iterator>
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 <numeric>
-#include <omptl/omptl>
+#include "omptl"
namespace omptl
{
@@ -73,11 +73,11 @@
} // namespace omptl
#ifdef _OPENMP
- #include <omptl/omptl_numeric_par.h>
+ #include "omptl_numeric_par.h"
#else
- #include <omptl/omptl_numeric_ser.h>
+ #include "omptl_numeric_ser.h"
#endif
-#include <omptl/omptl_numeric_extensions.h>
+#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 <omptl/omptl_numeric_extensions_par.h>
+ #include "omptl_numeric_extensions_par.h"
#else
- #include <omptl/omptl_numeric_extensions_ser.h>
+ #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 <functional>
#include <iterator>
-#include <omptl/omptl_algorithm>
-#include <omptl/omptl_tools.h>
+#include "omptl_algorithm"
+#include "omptl_tools.h"
namespace omptl
{