File tree Expand file tree Collapse file tree 3 files changed +26
-4
lines changed Expand file tree Collapse file tree 3 files changed +26
-4
lines changed Original file line number Diff line number Diff line change 33
33
elseif (${REDHAT_RELEASE} MATCHES "release 8." )
34
34
set (RHEL_TAG RHEL8 )
35
35
loadMeta (NAME rhel8 )
36
+ elseif (${REDHAT_RELEASE} MATCHES "release 9." )
37
+ set (RHEL_TAG RHEL9 )
38
+ loadMeta (NAME rhel9 )
36
39
else ()
37
40
logFatalError ("Cannot identify current RedHat release" )
38
41
endif ()
Original file line number Diff line number Diff line change @@ -91,11 +91,13 @@ function(__commit_executable target)
91
91
92
92
# cibles internes (compilées par le projet et déclarées via createLibrary)
93
93
get_property (BUILTIN GLOBAL PROPERTY BUILDSYSTEM_BUILTIN_LIBRARIES )
94
-
94
+ if (WIN32 )
95
+ get_target_property (DLOPEN ${target} NEED_DLOPEN )
96
+ endif ()
97
+
95
98
set (libraries_whole_archive )
96
-
99
+
97
100
foreach (library ${libraries} )
98
-
99
101
# check
100
102
if (NOT TARGET ${library} )
101
103
logFatalError ("undefined library ${library} linked with ${target} " )
@@ -116,7 +118,11 @@ function(__commit_executable target)
116
118
else ()
117
119
target_link_libraries (${target} PUBLIC ${library} )
118
120
endif ()
119
- else ()
121
+ elseif (${library} IN_LIST DLOPEN AND WIN32 )
122
+ # pour le chargement dynamique
123
+ set_property (TARGET ${target} APPEND PROPERTY DYNAMIC_LIBRARIES ${library} )
124
+ target_link_libraries (${target} PUBLIC ${library} )
125
+ else ()
120
126
target_link_libraries (${target} PUBLIC ${library} )
121
127
endif ()
122
128
Original file line number Diff line number Diff line change @@ -9,5 +9,18 @@ function(linkLibraries target)
9
9
10
10
# ajouts des libraries
11
11
set_property (TARGET ${target} APPEND PROPERTY BUILDSYSTEM_LIBRARIES ${ARGN} )
12
+ endfunction ()
13
+
14
+ function (linkDynLibraries target )
15
+
16
+ # commit ?
17
+ get_target_property (committed ${target} BUILDSYSTEM_COMMITTED )
12
18
19
+ if (${committed} )
20
+ logFatalError ("target ${target} is already committed, can't link libraries" )
21
+ endif ()
22
+
23
+ # ajouts des libraries
24
+ set_property (TARGET ${target} APPEND PROPERTY BUILDSYSTEM_LIBRARIES ${ARGN} )
25
+ set_property (TARGET ${target} APPEND PROPERTY NEED_DLOPEN ${ARGN} )
13
26
endfunction ()
You can’t perform that action at this time.
0 commit comments