Skip to content

Commit d849424

Browse files
falkTXfalkTX
committed
cmake: simplify logic for dgl libs setup
Signed-off-by: falkTX <falktx@falktx.com>
1 parent 8d13c16 commit d849424

File tree

2 files changed

+69
-69
lines changed

2 files changed

+69
-69
lines changed

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ if(DPF_LIBRARIES)
3434
if(PKG_CONFIG_FOUND)
3535
pkg_check_modules(CAIRO "cairo")
3636
if(CAIRO_FOUND AND (NOT HAIKU))
37-
dpf__add_dgl_cairo(TRUE, TRUE, TRUE)
37+
dpf__add_dgl_cairo(FALSE, TRUE, TRUE)
3838
endif()
3939
endif()
4040
dpf__add_dgl_external(TRUE, TRUE)
41-
dpf__add_dgl_opengl(TRUE, TRUE, TRUE)
41+
dpf__add_dgl_opengl(FALSE, TRUE, TRUE)
4242
endif()
4343

4444
if(DPF_EXAMPLES)

‎cmake/DPF-plugin.cmake‎

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -129,43 +129,43 @@ function(dpf_add_plugin NAME)
129129
set(_dgl_library)
130130
if(_dpf_plugin_FILES_UI)
131131
if(_dpf_plugin_UI_TYPE STREQUAL "cairo")
132-
dpf__add_dgl_cairo($<NOT:$<BOOL:${_dpf_plugin_NO_SHARED_RESOURCES}>>
133-
$<BOOL:${_dpf_plugin_USE_FILE_BROWSER}>
134-
$<BOOL:${_dpf_plugin_USE_WEB_VIEW}>)
132+
dpf__add_dgl_cairo(${_dpf_plugin_NO_SHARED_RESOURCES}
133+
${_dpf_plugin_USE_FILE_BROWSER}
134+
${_dpf_plugin_USE_WEB_VIEW})
135135
set(_dgl_library dgl-cairo)
136136
elseif(_dpf_plugin_UI_TYPE STREQUAL "external")
137-
dpf__add_dgl_external($<BOOL:${_dpf_plugin_USE_FILE_BROWSER}>
138-
$<BOOL:${_dpf_plugin_USE_WEB_VIEW}>)
137+
dpf__add_dgl_external(${_dpf_plugin_USE_FILE_BROWSER}
138+
${_dpf_plugin_USE_WEB_VIEW})
139139
set(_dgl_library dgl-external)
140140
elseif(_dpf_plugin_UI_TYPE STREQUAL "gles2")
141-
dpf__add_dgl_gles2($<NOT:$<BOOL:${_dpf_plugin_NO_SHARED_RESOURCES}>>
142-
$<BOOL:${_dpf_plugin_USE_FILE_BROWSER}>
143-
$<BOOL:${_dpf_plugin_USE_WEB_VIEW}>)
141+
dpf__add_dgl_gles2(${_dpf_plugin_NO_SHARED_RESOURCES}
142+
${_dpf_plugin_USE_FILE_BROWSER}
143+
${_dpf_plugin_USE_WEB_VIEW})
144144
set(_dgl_library dgl-gles2)
145145
elseif(_dpf_plugin_UI_TYPE STREQUAL "gles3")
146-
dpf__add_dgl_gles3($<NOT:$<BOOL:${_dpf_plugin_NO_SHARED_RESOURCES}>>
147-
$<BOOL:${_dpf_plugin_USE_FILE_BROWSER}>
148-
$<BOOL:${_dpf_plugin_USE_WEB_VIEW}>)
146+
dpf__add_dgl_gles3(${_dpf_plugin_NO_SHARED_RESOURCES}
147+
${_dpf_plugin_USE_FILE_BROWSER}
148+
${_dpf_plugin_USE_WEB_VIEW})
149149
set(_dgl_library dgl-gles3)
150150
elseif(_dpf_plugin_UI_TYPE STREQUAL "opengl")
151-
dpf__add_dgl_opengl($<NOT:$<BOOL:${_dpf_plugin_NO_SHARED_RESOURCES}>>
152-
$<BOOL:${_dpf_plugin_USE_FILE_BROWSER}>
153-
$<BOOL:${_dpf_plugin_USE_WEB_VIEW}>)
151+
dpf__add_dgl_opengl(${_dpf_plugin_NO_SHARED_RESOURCES}
152+
${_dpf_plugin_USE_FILE_BROWSER}
153+
${_dpf_plugin_USE_WEB_VIEW})
154154
set(_dgl_library dgl-opengl)
155155
elseif(_dpf_plugin_UI_TYPE STREQUAL "opengl3")
156-
dpf__add_dgl_opengl3($<NOT:$<BOOL:${_dpf_plugin_NO_SHARED_RESOURCES}>>
157-
$<BOOL:${_dpf_plugin_USE_FILE_BROWSER}>
158-
$<BOOL:${_dpf_plugin_USE_WEB_VIEW}>)
156+
dpf__add_dgl_opengl3(${_dpf_plugin_NO_SHARED_RESOURCES}
157+
${_dpf_plugin_USE_FILE_BROWSER}
158+
${_dpf_plugin_USE_WEB_VIEW})
159159
set(_dgl_library dgl-opengl3)
160160
elseif(_dpf_plugin_UI_TYPE STREQUAL "vulkan")
161-
dpf__add_dgl_vulkan($<NOT:$<BOOL:${_dpf_plugin_NO_SHARED_RESOURCES}>>
162-
$<BOOL:${_dpf_plugin_USE_FILE_BROWSER}>
163-
$<BOOL:${_dpf_plugin_USE_WEB_VIEW}>)
161+
dpf__add_dgl_vulkan(${_dpf_plugin_NO_SHARED_RESOURCES}
162+
${_dpf_plugin_USE_FILE_BROWSER}
163+
${_dpf_plugin_USE_WEB_VIEW})
164164
set(_dgl_library dgl-vulkan)
165165
elseif(_dpf_plugin_UI_TYPE STREQUAL "webview")
166166
set(_dpf_plugin_USE_WEB_VIEW TRUE)
167-
dpf__add_dgl_external($<BOOL:${_dpf_plugin_USE_FILE_BROWSER}>
168-
$<BOOL:${_dpf_plugin_USE_WEB_VIEW}>)
167+
dpf__add_dgl_external(${_dpf_plugin_USE_FILE_BROWSER}
168+
${_dpf_plugin_USE_WEB_VIEW})
169169
set(_dgl_library dgl-external)
170170
else()
171171
message(FATAL_ERROR "Unrecognized UI type for plugin: ${_dpf_plugin_UI_TYPE}")
@@ -308,43 +308,43 @@ function(dpf_add_executable NAME)
308308

309309
set(_dgl_library)
310310
if(_dpf_plugin_UI_TYPE STREQUAL "cairo")
311-
dpf__add_dgl_cairo($<NOT:$<BOOL:${_dpf_plugin_NO_SHARED_RESOURCES}>>
312-
$<BOOL:${_dpf_plugin_USE_FILE_BROWSER}>
313-
$<BOOL:${_dpf_plugin_USE_WEB_VIEW}>)
311+
dpf__add_dgl_cairo(${_dpf_plugin_NO_SHARED_RESOURCES}
312+
${_dpf_plugin_USE_FILE_BROWSER}
313+
${_dpf_plugin_USE_WEB_VIEW})
314314
set(_dgl_library dgl-cairo)
315315
elseif(_dpf_plugin_UI_TYPE STREQUAL "external")
316-
dpf__add_dgl_external($<BOOL:${_dpf_plugin_USE_FILE_BROWSER}>
317-
$<BOOL:${_dpf_plugin_USE_WEB_VIEW}>)
316+
dpf__add_dgl_external(${_dpf_plugin_USE_FILE_BROWSER}
317+
${_dpf_plugin_USE_WEB_VIEW})
318318
set(_dgl_library dgl-external)
319319
elseif(_dpf_plugin_UI_TYPE STREQUAL "gles2")
320-
dpf__add_dgl_gles2($<NOT:$<BOOL:${_dpf_plugin_NO_SHARED_RESOURCES}>>
321-
$<BOOL:${_dpf_plugin_USE_FILE_BROWSER}>
322-
$<BOOL:${_dpf_plugin_USE_WEB_VIEW}>)
320+
dpf__add_dgl_gles2(${_dpf_plugin_NO_SHARED_RESOURCES}
321+
${_dpf_plugin_USE_FILE_BROWSER}
322+
${_dpf_plugin_USE_WEB_VIEW})
323323
set(_dgl_library dgl-gles2)
324324
elseif(_dpf_plugin_UI_TYPE STREQUAL "gles3")
325-
dpf__add_dgl_gles3($<NOT:$<BOOL:${_dpf_plugin_NO_SHARED_RESOURCES}>>
326-
$<BOOL:${_dpf_plugin_USE_FILE_BROWSER}>
327-
$<BOOL:${_dpf_plugin_USE_WEB_VIEW}>)
325+
dpf__add_dgl_gles3(${_dpf_plugin_NO_SHARED_RESOURCES}
326+
${_dpf_plugin_USE_FILE_BROWSER}
327+
${_dpf_plugin_USE_WEB_VIEW})
328328
set(_dgl_library dgl-gles3)
329329
elseif(_dpf_plugin_UI_TYPE STREQUAL "opengl")
330-
dpf__add_dgl_opengl($<NOT:$<BOOL:${_dpf_plugin_NO_SHARED_RESOURCES}>>
331-
$<BOOL:${_dpf_plugin_USE_FILE_BROWSER}>
332-
$<BOOL:${_dpf_plugin_USE_WEB_VIEW}>)
330+
dpf__add_dgl_opengl(${_dpf_plugin_NO_SHARED_RESOURCES}
331+
${_dpf_plugin_USE_FILE_BROWSER}
332+
${_dpf_plugin_USE_WEB_VIEW})
333333
set(_dgl_library dgl-opengl)
334334
elseif(_dpf_plugin_UI_TYPE STREQUAL "opengl3")
335-
dpf__add_dgl_opengl3($<NOT:$<BOOL:${_dpf_plugin_NO_SHARED_RESOURCES}>>
336-
$<BOOL:${_dpf_plugin_USE_FILE_BROWSER}>
337-
$<BOOL:${_dpf_plugin_USE_WEB_VIEW}>)
335+
dpf__add_dgl_opengl3(${_dpf_plugin_NO_SHARED_RESOURCES}
336+
${_dpf_plugin_USE_FILE_BROWSER}
337+
${_dpf_plugin_USE_WEB_VIEW})
338338
set(_dgl_library dgl-opengl3)
339339
elseif(_dpf_plugin_UI_TYPE STREQUAL "vulkan")
340-
dpf__add_dgl_vulkan($<NOT:$<BOOL:${_dpf_plugin_NO_SHARED_RESOURCES}>>
341-
$<BOOL:${_dpf_plugin_USE_FILE_BROWSER}>
342-
$<BOOL:${_dpf_plugin_USE_WEB_VIEW}>)
340+
dpf__add_dgl_vulkan(${_dpf_plugin_NO_SHARED_RESOURCES}
341+
${_dpf_plugin_USE_FILE_BROWSER}
342+
${_dpf_plugin_USE_WEB_VIEW})
343343
set(_dgl_library dgl-vulkan)
344344
elseif(_dpf_plugin_UI_TYPE STREQUAL "webview")
345345
set(_dpf_plugin_USE_WEB_VIEW TRUE)
346-
dpf__add_dgl_external($<BOOL:${_dpf_plugin_USE_FILE_BROWSER}>
347-
$<BOOL:${_dpf_plugin_USE_WEB_VIEW}>)
346+
dpf__add_dgl_external(${_dpf_plugin_USE_FILE_BROWSER}
347+
${_dpf_plugin_USE_WEB_VIEW})
348348
set(_dgl_library dgl-external)
349349
else()
350350
message(FATAL_ERROR "Unrecognized UI type for executable: ${_dpf_plugin_UI_TYPE}")
@@ -860,7 +860,7 @@ endfunction()
860860
#
861861
# Add the Cairo variant of DGL, if not already available.
862862
#
863-
function(dpf__add_dgl_cairo SHARED_RESOURCES USE_FILE_BROWSER USE_WEB_VIEW)
863+
function(dpf__add_dgl_cairo NO_SHARED_RESOURCES USE_FILE_BROWSER USE_WEB_VIEW)
864864
if(TARGET dgl-cairo)
865865
return()
866866
endif()
@@ -888,10 +888,10 @@ function(dpf__add_dgl_cairo SHARED_RESOURCES USE_FILE_BROWSER USE_WEB_VIEW)
888888
"${DPF_ROOT_DIR}/dgl/src/Window.cpp"
889889
"${DPF_ROOT_DIR}/dgl/src/WindowPrivateData.cpp"
890890
"${DPF_ROOT_DIR}/dgl/src/Cairo.cpp")
891-
if(SHARED_RESOURCES)
892-
target_sources(dgl-cairo PRIVATE "${DPF_ROOT_DIR}/dgl/src/Resources.cpp")
893-
else()
891+
if(NO_SHARED_RESOURCES)
894892
target_compile_definitions(dgl-cairo PUBLIC "DGL_NO_SHARED_RESOURCES")
893+
else()
894+
target_sources(dgl-cairo PRIVATE "${DPF_ROOT_DIR}/dgl/src/Resources.cpp")
895895
endif()
896896
if(APPLE)
897897
target_sources(dgl-cairo PRIVATE
@@ -1015,7 +1015,7 @@ endfunction()
10151015
#
10161016
# Add the GLESv2 variant of DGL, if not already available.
10171017
#
1018-
function(dpf__add_dgl_gles2 SHARED_RESOURCES USE_FILE_BROWSER USE_WEB_VIEW)
1018+
function(dpf__add_dgl_gles2 NO_SHARED_RESOURCES USE_FILE_BROWSER USE_WEB_VIEW)
10191019
if(TARGET dgl-gles2)
10201020
return()
10211021
endif()
@@ -1046,10 +1046,10 @@ function(dpf__add_dgl_gles2 SHARED_RESOURCES USE_FILE_BROWSER USE_WEB_VIEW)
10461046
"${DPF_ROOT_DIR}/dgl/src/OpenGL.cpp"
10471047
"${DPF_ROOT_DIR}/dgl/src/OpenGL3.cpp"
10481048
"${DPF_ROOT_DIR}/dgl/src/NanoVG.cpp")
1049-
if(SHARED_RESOURCES)
1050-
target_sources(dgl-gles2 PRIVATE "${DPF_ROOT_DIR}/dgl/src/Resources.cpp")
1051-
else()
1049+
if(NO_SHARED_RESOURCES)
10521050
target_compile_definitions(dgl-gles2 PUBLIC "DGL_NO_SHARED_RESOURCES")
1051+
else()
1052+
target_sources(dgl-gles2 PRIVATE "${DPF_ROOT_DIR}/dgl/src/Resources.cpp")
10531053
endif()
10541054
if(APPLE)
10551055
target_sources(dgl-gles2 PRIVATE
@@ -1114,7 +1114,7 @@ endfunction()
11141114
#
11151115
# Add the GLESv3 variant of DGL, if not already available.
11161116
#
1117-
function(dpf__add_dgl_gles3 SHARED_RESOURCES USE_FILE_BROWSER USE_WEB_VIEW)
1117+
function(dpf__add_dgl_gles3 NO_SHARED_RESOURCES USE_FILE_BROWSER USE_WEB_VIEW)
11181118
if(TARGET dgl-gles3)
11191119
return()
11201120
endif()
@@ -1145,10 +1145,10 @@ function(dpf__add_dgl_gles3 SHARED_RESOURCES USE_FILE_BROWSER USE_WEB_VIEW)
11451145
"${DPF_ROOT_DIR}/dgl/src/OpenGL.cpp"
11461146
"${DPF_ROOT_DIR}/dgl/src/OpenGL3.cpp"
11471147
"${DPF_ROOT_DIR}/dgl/src/NanoVG.cpp")
1148-
if(SHARED_RESOURCES)
1149-
target_sources(dgl-gles3 PRIVATE "${DPF_ROOT_DIR}/dgl/src/Resources.cpp")
1150-
else()
1148+
if(NO_SHARED_RESOURCES)
11511149
target_compile_definitions(dgl-gles3 PUBLIC "DGL_NO_SHARED_RESOURCES")
1150+
else()
1151+
target_sources(dgl-gles3 PRIVATE "${DPF_ROOT_DIR}/dgl/src/Resources.cpp")
11521152
endif()
11531153
if(APPLE)
11541154
target_sources(dgl-gles3 PRIVATE
@@ -1213,7 +1213,7 @@ endfunction()
12131213
#
12141214
# Add the OpenGL variant of DGL, if not already available.
12151215
#
1216-
function(dpf__add_dgl_opengl SHARED_RESOURCES USE_FILE_BROWSER USE_WEB_VIEW)
1216+
function(dpf__add_dgl_opengl NO_SHARED_RESOURCES USE_FILE_BROWSER USE_WEB_VIEW)
12171217
if(TARGET dgl-opengl)
12181218
return()
12191219
endif()
@@ -1244,10 +1244,10 @@ function(dpf__add_dgl_opengl SHARED_RESOURCES USE_FILE_BROWSER USE_WEB_VIEW)
12441244
"${DPF_ROOT_DIR}/dgl/src/OpenGL.cpp"
12451245
"${DPF_ROOT_DIR}/dgl/src/OpenGL2.cpp"
12461246
"${DPF_ROOT_DIR}/dgl/src/NanoVG.cpp")
1247-
if(SHARED_RESOURCES)
1248-
target_sources(dgl-opengl PRIVATE "${DPF_ROOT_DIR}/dgl/src/Resources.cpp")
1249-
else()
1247+
if(NO_SHARED_RESOURCES)
12501248
target_compile_definitions(dgl-opengl PUBLIC "DGL_NO_SHARED_RESOURCES")
1249+
else()
1250+
target_sources(dgl-opengl PRIVATE "${DPF_ROOT_DIR}/dgl/src/Resources.cpp")
12511251
endif()
12521252
if(APPLE)
12531253
target_sources(dgl-opengl PRIVATE
@@ -1309,7 +1309,7 @@ endfunction()
13091309
#
13101310
# Add the OpenGL3 variant of DGL, if not already available.
13111311
#
1312-
function(dpf__add_dgl_opengl3 SHARED_RESOURCES USE_FILE_BROWSER USE_WEB_VIEW)
1312+
function(dpf__add_dgl_opengl3 NO_SHARED_RESOURCES USE_FILE_BROWSER USE_WEB_VIEW)
13131313
if(TARGET dgl-opengl3)
13141314
return()
13151315
endif()
@@ -1340,10 +1340,10 @@ function(dpf__add_dgl_opengl3 SHARED_RESOURCES USE_FILE_BROWSER USE_WEB_VIEW)
13401340
"${DPF_ROOT_DIR}/dgl/src/OpenGL.cpp"
13411341
"${DPF_ROOT_DIR}/dgl/src/OpenGL3.cpp"
13421342
"${DPF_ROOT_DIR}/dgl/src/NanoVG.cpp")
1343-
if(SHARED_RESOURCES)
1344-
target_sources(dgl-opengl3 PRIVATE "${DPF_ROOT_DIR}/dgl/src/Resources.cpp")
1345-
else()
1343+
if(NO_SHARED_RESOURCES)
13461344
target_compile_definitions(dgl-opengl3 PUBLIC "DGL_NO_SHARED_RESOURCES")
1345+
else()
1346+
target_sources(dgl-opengl3 PRIVATE "${DPF_ROOT_DIR}/dgl/src/Resources.cpp")
13471347
endif()
13481348
if(APPLE)
13491349
target_sources(dgl-opengl3 PRIVATE
@@ -1401,7 +1401,7 @@ endfunction()
14011401
#
14021402
# Add the Vulkan variant of DGL, if not already available.
14031403
#
1404-
function(dpf__add_dgl_vulkan SHARED_RESOURCES USE_FILE_BROWSER USE_WEB_VIEW)
1404+
function(dpf__add_dgl_vulkan NO_SHARED_RESOURCES USE_FILE_BROWSER USE_WEB_VIEW)
14051405
if(TARGET dgl-vulkan)
14061406
return()
14071407
endif()
@@ -1427,9 +1427,9 @@ function(dpf__add_dgl_vulkan SHARED_RESOURCES USE_FILE_BROWSER USE_WEB_VIEW)
14271427
"${DPF_ROOT_DIR}/dgl/src/WindowPrivateData.cpp"
14281428
"${DPF_ROOT_DIR}/dgl/src/Vulkan.cpp")
14291429
if(NO_SHARED_RESOURCES)
1430-
target_sources(dgl-vulkan PRIVATE "${DPF_ROOT_DIR}/dgl/src/Resources.cpp")
1431-
else()
14321430
target_compile_definitions(dgl-vulkan PUBLIC "DGL_NO_SHARED_RESOURCES")
1431+
else()
1432+
target_sources(dgl-vulkan PRIVATE "${DPF_ROOT_DIR}/dgl/src/Resources.cpp")
14331433
endif()
14341434
if(APPLE)
14351435
target_sources(dgl-vulkan PRIVATE

0 commit comments

Comments
 (0)