1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
commit a3cb514515b63080df52b21c2a2f8d0a3d03ca0d
Author: François Trahay <francois.trahay@telecom-sudparis.eu>
Date: Tue Aug 23 16:14:03 2022 +0200
openmp: rename the pomp2 library into eztpomp to avoid collision with opari's pomp library
diff --git a/src/modules/omp/CMakeLists.txt b/src/modules/omp/CMakeLists.txt
index 8e8cae84..2400e756 100644
--- a/src/modules/omp/CMakeLists.txt
+++ b/src/modules/omp/CMakeLists.txt
@@ -1,7 +1,6 @@
cmake_minimum_required (VERSION 3.1)
-# Create : libPomp2
-add_library(pomp2 SHARED
+add_library(eztpomp SHARED
pomp-lib-dummy/pomp2_fwrapper.c
pomp-lib-dummy/pomp2_fwrapper_base.c
pomp-lib-dummy/pomp2_fwrapper_base.h
@@ -11,12 +10,12 @@ add_library(pomp2 SHARED
pomp-lib-dummy/pomp2_region_info.h
)
-target_include_directories(pomp2
+target_include_directories(eztpomp
PUBLIC
pomp-lib-dummy
)
-target_compile_options(pomp2
+target_compile_options(eztpomp
PRIVATE
-Wall -Wextra -Wpedantic
-Werror
@@ -24,12 +23,12 @@ target_compile_options(pomp2
${OpenMP_C_FLAGS}
)
-target_link_libraries(pomp2
+target_link_libraries(eztpomp
PRIVATE
eztrace-core
)
-target_compile_options(pomp2
+target_compile_options(eztpomp
PRIVATE
-Wall -Wextra -Wpedantic
-Werror
@@ -68,6 +67,6 @@ target_compile_options(eztrace-openmp
set(EZTRACE_CC_PATH ${CMAKE_CURRENT_BINARY_DIR}/bin/eztrace_cc)
configure_file (eztrace_cc.in ${EZTRACE_CC_PATH} @ONLY)
-install(TARGETS pomp2 eztrace-openmp
+install(TARGETS eztpomp eztrace-openmp
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(PROGRAMS ${EZTRACE_CC_PATH} DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/src/modules/omp/eztrace_cc.in b/src/modules/omp/eztrace_cc.in
index 8dbc4d3d..5f64839a 100644
--- a/src/modules/omp/eztrace_cc.in
+++ b/src/modules/omp/eztrace_cc.in
@@ -15,7 +15,7 @@ bindir=${exec_prefix}/bin
OPARI=@OPARI2@
OPARI_CFLAGS=$(@OPARI2_CONFIG@ --cflags)
CFLAGS="-I${includedir} $OPARI_CFLAGS"
-LDFLAGS="-lpomp2 -L${libdir} -Wl,-rpath=${libdir}"
+LDFLAGS="-leztpomp -L${libdir} -Wl,-rpath=${libdir}"
debug=n
|
