1 diff -pruN openturns_ref/CMakeLists.txt openturns_dev/CMakeLists.txt
2 --- openturns_ref/CMakeLists.txt 2021-02-19 15:46:57.077060192 +0100
3 +++ openturns_dev/CMakeLists.txt 2021-02-19 15:46:46.576956703 +0100
4 @@ -125,6 +125,10 @@ set (OPENTURNS_TEMPDIR
5 set (TEMPDIR ${OPENTURNS_TEMPDIR})
7 set (CMAKE_CXX_STANDARD 11)
8 +SET(LAPACK_ROOT_DIR $ENV{LAPACK_ROOT_DIR})
10 + LIST(APPEND CMAKE_PREFIX_PATH "${LAPACK_ROOT_DIR}")
11 +ENDIF(LAPACK_ROOT_DIR)
13 if (NOT DEFINED LAPACK_LIBRARIES)
14 find_package (LAPACK REQUIRED)
15 @@ -156,7 +160,11 @@ if (USE_FLEX)
21 + SET(TBB_ROOT_DIR $ENV{TBB_ROOT_DIR})
23 + LIST(APPEND CMAKE_PREFIX_PATH "${TBB_ROOT_DIR}")
28 @@ -200,6 +208,10 @@ if (USE_DOXYGEN)
32 + SET(LIBXML2_ROOT_DIR $ENV{LIBXLM2_ROOT_DIR})
33 + if(LIBXML2_ROOT_DIR)
34 + LIST(APPEND CMAKE_PREFIX_PATH "${LIBXML2_ROOT_DIR}")
35 + endif(LIBXML2_ROOT_DIR)
36 find_package (LibXml2)
39 @@ -210,7 +222,7 @@ if (LIBXML2_FOUND)
43 - find_package(HDF5 COMPONENTS CXX)
44 + find_package(HDF5 COMPONENTS CXX HL)
47 set (OPENTURNS_HAVE_HDF5 TRUE)
48 @@ -218,7 +230,6 @@ if (HDF5_FOUND)
49 list (APPEND OPENTURNS_PRIVATE_INCLUDE_DIRS ${HDF5_INCLUDE_DIRS})
50 list (APPEND OPENTURNS_PRIVATE_LIBRARIES ${HDF5_LIBRARIES})
54 set (CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/lib/include/pthread_win32 ${CMAKE_CURRENT_SOURCE_DIR}/lib/include)
55 include_directories (${PROJECT_SOURCE_DIR}/lib/include/pthread_win32 ${CMAKE_CURRENT_SOURCE_DIR}/lib/include)
56 @@ -257,7 +268,7 @@ if (NOT R_EXECUTABLE)
60 - find_package (NLopt CONFIG QUIET)
61 +# find_package (NLopt CONFIG QUIET)
63 message(STATUS "Found NLopt: ${NLopt_DIR}")
66 diff -pruN openturns_ref/cmake/FindTBB.cmake openturns_dev/cmake/FindTBB.cmake
67 --- openturns_ref/cmake/FindTBB.cmake 2021-02-19 15:46:57.058060005 +0100
68 +++ openturns_dev/cmake/FindTBB.cmake 2021-02-19 15:51:59.654083375 +0100
70 # (To distributed this file outside of CMake, substitute the full
71 # License text for the above reference.)
73 +SET(TBB_ROOT_DIR $ENV{TBB_ROOT_DIR})
75 + LIST(APPEND CMAKE_PREFIX_PATH "${TBB_ROOT_DIR}")
78 find_path (TBB_INCLUDE_DIR NAMES tbb/tbb.h DOC "TBB include directory")
80 set (TBB_INCLUDE_DIRS ${TBB_INCLUDE_DIR})
82 diff -pruN openturns_ref/cmake/FindNLopt.cmake openturns_dev/cmake/FindNLopt.cmake
83 --- openturns_ref/cmake/FindNLopt.cmake 2021-02-19 15:46:57.064060064 +0100
84 +++ openturns_dev/cmake/FindNLopt.cmake 2021-02-19 15:53:27.134956381 +0100
86 # NLOPT_ROOT_DIR - root dir (ex. /usr/local)
88 # set NLOPT_INCLUDE_DIR
89 +SET(NLOPT_ROOT_DIR $ENV{NLOPT_ROOT_DIR})
92 + LIST(APPEND CMAKE_PREFIX_PATH "${NLOPT_ROOT_DIR}")
93 + LIST(APPEND CMAKE_PREFIX_PATH "${NLOPT_ROOT_DIR}/include")
94 + LIST(APPEND CMAKE_PREFIX_PATH "${NLOPT_ROOT_DIR}/lib")
96 + MESSAGE(FATAL_ERROR "PLEASE SET ENVIRONMENT VARIABLE NLOPT_ROOT_DIR")
97 +ENDIF(NLOPT_ROOT_DIR)
99 find_path (NLOPT_INCLUDE_DIR
101 + HINTS ${NLOPT_ROOT_DIR}/include
103 - "Nlopt include directory"
104 + "Nlopt include directory"
107 # set NLOPT_INCLUDE_DIRS
108 @@ -22,9 +33,10 @@ set (NLOPT_INCLUDE_DIRS ${NLOPT_INCLUDE_
111 find_library (NLOPT_LIBRARY
112 - NAMES nlopt_cxx nlopt
114 + HINTS ${NLOPT_ROOT_DIR}/lib
116 - "Nlopt library location"
117 + "Nlopt library location"
120 # set NLOPT_LIBRARIES
122 diff -pruN openturns_ref/lib/src/CMakeLists.txt openturns_dev/lib/src/CMakeLists.txt
123 --- openturns_ref/lib/src/CMakeLists.txt 2021-02-19 15:46:49.880989268 +0100
124 +++ openturns_dev/lib/src/CMakeLists.txt 2021-02-19 16:12:54.874714974 +0100
125 @@ -80,15 +80,15 @@ if (BISON_FOUND AND FLEX_FOUND)
126 add_dependencies (OT generate_csv_parser)
129 -target_link_libraries (OT PUBLIC ${OPENTURNS_LIBRARIES})
130 -target_link_libraries (OT PRIVATE ${OPENTURNS_PRIVATE_LIBRARIES})
131 +target_link_libraries (OT PUBLIC ${OPENTURNS_LIBRARIES} ${HDF5_LIBRARIES} ${TBB_LIBRARIES})
132 +target_link_libraries (OT PRIVATE ${OPENTURNS_PRIVATE_LIBRARIES} ${HDF5_LIBRARIES} ${TBB_LIBRARIES})
134 target_include_directories (OT INTERFACE $<INSTALL_INTERFACE:include>)
135 target_include_directories (OT PUBLIC ${OPENTURNS_INCLUDE_DIRS})
137 # Build an empty executable to check link dependencies and completeness
138 add_executable (linktest main.cxx)
139 -target_link_libraries (linktest OT)
140 +target_link_libraries (linktest OT ${TBB_LIBRARIES} ${HDF5_LIBRARIES})
141 set_target_properties (linktest PROPERTIES
142 INSTALL_RPATH "${CMAKE_INSTALL_RPATH};${CMAKE_BINARY_DIR}/lib/src")
144 @@ -109,5 +109,5 @@ install (TARGETS OT
145 if (UNIX AND BUILD_SHARED_LIBS)
146 set (OT_GDB_PY ${CMAKE_SHARED_LIBRARY_PREFIX}OT${CMAKE_SHARED_LIBRARY_SUFFIX}.${LIB_VERSION}-gdb.py)
147 execute_process (COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/libOT-gdb.py ${CMAKE_CURRENT_BINARY_DIR}/${OT_GDB_PY})
148 - install (FILES libOT-gdb.py DESTINATION ${OPENTURNS_DATA_PATH}/gdb/auto-load/${LIBRARY_PATH} RENAME ${OT_GDB_PY})
149 + install (FILES libOT-gdb.py DESTINATION ${OPENTURNS_DATA_PATH}/gdb/auto-load RENAME ${OT_GDB_PY})
152 diff -pruN openturns_ref/lib/src/Base/Common/openturns/TBB.hxx openturns_dev/lib/src/Base/Common/openturns/TBB.hxx
153 --- openturns_ref/lib/src/Base/Common/openturns/TBB.hxx 2021-02-19 15:46:48.419974868 +0100
154 +++ openturns_dev/lib/src/Base/Common/openturns/TBB.hxx 2021-02-19 15:46:37.804870246 +0100
156 # define __TBBMALLOC_NO_IMPLICIT_LINKAGE 1
159 +#define TBB_PREVIEW_TASK_ARENA 1
160 #include <tbb/task_arena.h>
161 #include <tbb/parallel_sort.h>
162 #include <tbb/parallel_reduce.h>