Skip to content

Commit 7993179

Browse files
jp9000jp9000
committed
cmake: Add cmake folders
1 parent 42bbca3 commit 7993179

File tree

63 files changed

+102
-33
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+102
-33
lines changed

‎CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ project(obs-studio)
99

1010
option(BUILD_CAPTIONS "Build captions" FALSE)
1111

12+
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
13+
1214
if(WIN32)
1315
cmake_minimum_required(VERSION 3.16)
1416

‎UI/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,7 @@ if (APPLE)
402402
Qt5::MacExtras)
403403
set_target_properties(obs PROPERTIES LINK_FLAGS "-pagezero_size 10000 -image_base 100000000")
404404
endif()
405+
set_target_properties(obs PROPERTIES FOLDER "frontend")
405406

406407
define_graphic_modules(obs)
407408

‎UI/frontend-plugins/decklink-output-ui/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,6 @@ target_link_libraries(decklink-ouput-ui
6464
obs-frontend-api
6565
Qt5::Widgets
6666
libobs)
67+
set_target_properties(decklink-ouput-ui PROPERTIES FOLDER "frontend")
6768

6869
install_obs_plugin_with_data(decklink-ouput-ui data)

‎UI/frontend-plugins/frontend-tools/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,5 +122,6 @@ target_link_libraries(frontend-tools
122122
obs-frontend-api
123123
Qt5::Widgets
124124
libobs)
125+
set_target_properties(frontend-tools PROPERTIES FOLDER "frontend")
125126

126127
install_obs_plugin_with_data(frontend-tools data)

‎UI/obs-frontend-api/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ add_library(obs-frontend-api SHARED
2222
${obs-frontend-api_HEADERS})
2323
target_link_libraries(obs-frontend-api
2424
libobs)
25+
set_target_properties(obs-frontend-api PROPERTIES FOLDER "frontend")
2526

2627
if(UNIX AND NOT APPLE)
2728
set_target_properties(obs-frontend-api

‎UI/win-update/updater/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,4 @@ target_link_libraries(updater
5151
shell32
5252
winhttp
5353
)
54+
set_target_properties(updater PROPERTIES FOLDER "frontend")

‎deps/blake2/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@ set(blake2_HEADERS
3030
add_library(blake2 STATIC
3131
${blake2_SOURCES}
3232
${blake2_HEADERS})
33+
set_target_properties(blake2 PROPERTIES FOLDER "deps")

‎deps/file-updater/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@ target_link_libraries(file-updater
3030
${LIBCURL_LIBRARIES}
3131
${file-updater_PLATFORM_DEPS}
3232
libobs)
33+
set_target_properties(file-updater PROPERTIES FOLDER "deps")

‎deps/glad/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ add_library(glad SHARED
3535
${glad_SOURCES}
3636
${glad_PLATFORM_SOURCES})
3737
set_target_properties(glad PROPERTIES
38+
FOLDER "deps"
3839
OUTPUT_NAME obsglad
3940
VERSION "0"
4041
SOVERSION "0")

‎deps/ipc-util/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ endif()
2929
add_library(ipc-util STATIC
3030
${ipc-util_SOURCES}
3131
${ipc-util_HEADERS})
32+
set_target_properties(ipc-util PROPERTIES FOLDER "deps")
3233
target_include_directories(ipc-util
3334
PUBLIC .)
3435
target_link_libraries(ipc-util)

‎deps/jansson/CMakeLists.txt

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ set(JANSSON_HDR_PRIVATE
342342
${CMAKE_CURRENT_SOURCE_DIR}/src/utf.h
343343
${CMAKE_CURRENT_BINARY_DIR}/private_include/jansson_private_config.h)
344344

345-
set(JANSSON_HDR_PUBLIC
345+
set(JANSSON_HDR_PUBLIC
346346
${CMAKE_CURRENT_BINARY_DIR}/include/jansson_config.h
347347
${CMAKE_CURRENT_SOURCE_DIR}/src/jansson.h)
348348

@@ -351,21 +351,22 @@ source_group("Library Private Headers" FILES ${JANSSON_HDR_PRIVATE})
351351
source_group("Library Public Headers" FILES ${JANSSON_HDR_PUBLIC})
352352

353353
if(JANSSON_BUILD_SHARED_LIBS)
354-
add_library(jansson SHARED
355-
${JANSSON_SRC}
356-
${JANSSON_HDR_PRIVATE}
357-
${JANSSON_HDR_PUBLIC}
354+
add_library(jansson SHARED
355+
${JANSSON_SRC}
356+
${JANSSON_HDR_PRIVATE}
357+
${JANSSON_HDR_PUBLIC}
358358
src/jansson.def)
359359

360360
set_target_properties(jansson PROPERTIES
361361
VERSION ${JANSSON_VERSION}
362362
SOVERSION ${JANSSON_SOVERSION})
363363
else()
364-
add_library(jansson
364+
add_library(jansson
365365
${JANSSON_SRC}
366-
${JANSSON_HDR_PRIVATE}
366+
${JANSSON_HDR_PRIVATE}
367367
${JANSSON_HDR_PUBLIC})
368368
endif()
369+
set_target_properties(jansson PROPERTIES FOLDER "deps")
369370

370371
if (JANSSON_EXAMPLES)
371372
add_executable(simple_parse "${PROJECT_SOURCE_DIR}/examples/simple_parse.c")
@@ -379,12 +380,12 @@ if (JANSSON_BUILD_DOCS)
379380
find_package(Sphinx)
380381

381382
if (NOT SPHINX_FOUND)
382-
message(WARNING "Sphinx not found. Cannot generate documentation!
383+
message(WARNING "Sphinx not found. Cannot generate documentation!
383384
Set -DJANSSON_BUILD_DOCS=OFF to get rid of this message.")
384385
else()
385386
if (Sphinx_VERSION_STRING VERSION_LESS 1.0)
386-
message(WARNING "Your Sphinx version is too old!
387-
This project requires Sphinx v1.0 or above to produce
387+
message(WARNING "Your Sphinx version is too old!
388+
This project requires Sphinx v1.0 or above to produce
388389
proper documentation (you have v${Sphinx_VERSION_STRING}).
389390
You will get output but it will have errors.")
390391
endif()
@@ -437,7 +438,7 @@ if (JANSSON_BUILD_DOCS)
437438
list(APPEND DOC_TARGETS latex)
438439
endif()
439440
endif()
440-
441+
441442
# The doc target will build all documentation targets.
442443
add_custom_target(doc)
443444

@@ -579,7 +580,7 @@ if (NOT JANSSON_WITHOUT_TESTS)
579580

580581
# Enable using "make check" just like the autotools project.
581582
# By default cmake creates a target "make test"
582-
add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}
583+
add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}
583584
DEPENDS json_process ${api_tests})
584585
endif ()
585586

@@ -624,33 +625,33 @@ export(TARGETS jansson
624625
export(PACKAGE jansson)
625626

626627
# Generate the config file for the build-tree.
627-
set(JANSSON__INCLUDE_DIRS
628+
set(JANSSON__INCLUDE_DIRS
628629
"${PROJECT_SOURCE_DIR}/include"
629630
"${PROJECT_BINARY_DIR}/include")
630631
set(JANSSON_INCLUDE_DIRS ${JANSSON__INCLUDE_DIRS} CACHE PATH "Jansson include directories")
631632
configure_file(${PROJECT_SOURCE_DIR}/cmake/JanssonConfig.cmake.in
632-
${PROJECT_BINARY_DIR}/JanssonConfig.cmake
633+
${PROJECT_BINARY_DIR}/JanssonConfig.cmake
633634
@ONLY)
634635

635636
# Generate the config file for the installation tree.
636-
file(RELATIVE_PATH
637-
REL_INCLUDE_DIR
637+
file(RELATIVE_PATH
638+
REL_INCLUDE_DIR
638639
"${JANSSON_INSTALL_CMAKE_DIR}"
639640
"${JANSSON_INSTALL_INCLUDE_DIR}") # Calculate the relative directory from the Cmake dir.
640641

641-
# Note the EVENT_CMAKE_DIR is defined in JanssonConfig.cmake.in,
642+
# Note the EVENT_CMAKE_DIR is defined in JanssonConfig.cmake.in,
642643
# we escape it here so it's evaluated when it is included instead
643-
# so that the include dirs are given relative to where the
644+
# so that the include dirs are given relative to where the
644645
# config file is located.
645-
set(JANSSON__INCLUDE_DIRS
646-
"\${JANSSON_CMAKE_DIR}/${REL_INCLUDE_DIR}")
646+
set(JANSSON__INCLUDE_DIRS
647+
"\${JANSSON_CMAKE_DIR}/${REL_INCLUDE_DIR}")
647648
configure_file(${PROJECT_SOURCE_DIR}/cmake/JanssonConfig.cmake.in
648-
${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/JanssonConfig.cmake
649+
${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/JanssonConfig.cmake
649650
@ONLY)
650651

651652
# Generate version info for both build-tree and install-tree.
652653
configure_file(${PROJECT_SOURCE_DIR}/cmake/JanssonConfigVersion.cmake.in
653-
${PROJECT_BINARY_DIR}/JanssonConfigVersion.cmake
654+
${PROJECT_BINARY_DIR}/JanssonConfigVersion.cmake
654655
@ONLY)
655656

656657
# Define the public headers.
@@ -671,7 +672,7 @@ install(TARGETS jansson
671672
PUBLIC_HEADER DESTINATION "${JANSSON_INSTALL_INCLUDE_DIR}" COMPONENT dev)
672673

673674
# Install the pkg-config.
674-
install (FILES
675+
install (FILES
675676
${CMAKE_CURRENT_BINARY_DIR}/jansson.pc
676677
DESTINATION ${JANSSON_INSTALL_LIB_DIR}/pkgconfig COMPONENT dev)
677678

@@ -682,12 +683,12 @@ install(FILES
682683
DESTINATION "${JANSSON_INSTALL_CMAKE_DIR}" COMPONENT dev)
683684

684685
# Install exports for the install-tree.
685-
install(EXPORT JanssonTargets
686+
install(EXPORT JanssonTargets
686687
DESTINATION "${JANSSON_INSTALL_CMAKE_DIR}" COMPONENT dev)
687688
endif()
688689

689690
# For use when simply using add_library from a parent project to build jansson.
690691
set(JANSSON_LIBRARIES jansson CACHE STRING "Jansson libraries")
691692

692693
target_include_directories(jansson
693-
PUBLIC src "${CMAKE_CURRENT_BINARY_DIR}/include")
694+
PUBLIC src "${CMAKE_CURRENT_BINARY_DIR}/include")

‎deps/libcaption/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,4 @@ set(CAPTION_HEADERS
3636
)
3737

3838
add_library(caption STATIC ${CAPTION_SOURCES})
39+
set_target_properties(caption PROPERTIES FOLDER "deps")

‎deps/libff/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ endif(WIN32)
5050
add_library (libff STATIC
5151
${libff_HEADERS}
5252
${libff_SOURCES})
53+
set_target_properties(libff PROPERTIES FOLDER "deps")
5354

5455
target_include_directories(libff
5556
PUBLIC .)

‎deps/lzma/CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 3.2)
22

33
project(lzma)
44

5-
set(LIBLZMA_INCLUDE_DIRS
5+
set(LIBLZMA_INCLUDE_DIRS
66
"${CMAKE_CURRENT_SOURCE_DIR}"
7-
"${CMAKE_CURRENT_SOURCE_DIR}/liblzma/api"
7+
"${CMAKE_CURRENT_SOURCE_DIR}/liblzma/api"
88
CACHE PATH "lzma include path")
99

1010
set(LIBLZMA_CONFIG
@@ -117,7 +117,7 @@ set(liblzma_simple_SOURCES
117117
liblzma/simple/simple_coder.c
118118
liblzma/simple/simple_encoder.c
119119
liblzma/simple/simple_decoder.c
120-
120+
121121
liblzma/simple/arm.c
122122
liblzma/simple/armthumb.c
123123
liblzma/simple/ia64.c
@@ -145,3 +145,4 @@ add_library(lzma STATIC
145145
${liblzma_lzma_SOURCES}
146146
${liblzma_rangecoder_SOURCES}
147147
${liblzma_simple_SOURCES})
148+
set_target_properties(lzma PROPERTIES FOLDER "deps")

‎deps/media-playback/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,4 @@ endif()
4141
target_link_libraries(media-playback
4242
${FFMPEG_LIBRARIES}
4343
)
44+
set_target_properties(media-playback PROPERTIES FOLDER "deps")

‎deps/obs-scripting/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,8 @@ target_link_libraries(obs-scripting
207207
${obs-scripting_PLATFORM_DEPS}
208208
)
209209

210+
set_target_properties(obs-scripting PROPERTIES FOLDER "scripting")
211+
210212
if(PYTHONLIBS_FOUND)
211213
add_subdirectory(obspython)
212214
endif()

‎deps/obs-scripting/obslua/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ else()
3535
endif()
3636
SWIG_LINK_LIBRARIES(obslua obs-scripting libobs ${LUA_LIBRARIES} ${EXTRA_LIBS})
3737

38+
set_target_properties(obslua PROPERTIES FOLDER "scripting")
39+
3840
function(install_plugin_bin_swig target additional_target)
3941
if(APPLE)
4042
set(_bit_suffix "")

‎deps/obs-scripting/obspython/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ ELSE()
5454
SWIG_LINK_LIBRARIES(obspython obs-scripting libobs ${PYTHON_LIBRARIES})
5555
ENDIF()
5656

57+
set_target_properties(_obspython PROPERTIES FOLDER "scripting")
58+
5759
function(install_plugin_bin_swig target additional_target)
5860
if(APPLE)
5961
set(_bit_suffix "")

‎deps/w32-pthreads/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@ target_include_directories(w32-pthreads
2525
PUBLIC
2626
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>")
2727
target_link_libraries(w32-pthreads)
28+
set_target_properties(w32-pthreads PROPERTIES FOLDER "deps")
2829

2930
install_obs_core(w32-pthreads EXPORT w32-pthreads)

‎libobs-d3d11/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ add_library(libobs-d3d11 MODULE
4747
${libobs-d3d11_HEADERS})
4848
set_target_properties(libobs-d3d11
4949
PROPERTIES
50+
FOLDER "core"
5051
OUTPUT_NAME libobs-d3d11
5152
PREFIX "")
5253
target_link_libraries(libobs-d3d11

‎libobs-opengl/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,13 @@ endif()
8484
if(WIN32 OR APPLE)
8585
set_target_properties(libobs-opengl
8686
PROPERTIES
87+
FOLDER "core"
8788
OUTPUT_NAME libobs-opengl
8889
PREFIX "")
8990
else()
9091
set_target_properties(libobs-opengl
9192
PROPERTIES
93+
FOLDER "core"
9294
OUTPUT_NAME obs-opengl
9395
VERSION 0.0
9496
SOVERSION 0

‎libobs-winrt/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ add_library(libobs-winrt MODULE
1717
${libobs-winrt_HEADERS})
1818
set_target_properties(libobs-winrt
1919
PROPERTIES
20+
FOLDER "plugins/win-capture"
2021
OUTPUT_NAME libobs-winrt
2122
PREFIX "")
2223
target_precompile_headers(libobs-winrt

‎libobs/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,7 @@ if(UNIX AND NOT APPLE)
480480
endif()
481481

482482
set_target_properties(libobs PROPERTIES
483+
FOLDER "core"
483484
OUTPUT_NAME obs
484485
VERSION "0"
485486
SOVERSION "0")

‎plugins/coreaudio-encoder/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,6 @@ add_library(coreaudio-encoder MODULE
3737
target_link_libraries(coreaudio-encoder
3838
libobs
3939
${coreaudio-encoder_LIBS})
40+
set_target_properties(coreaudio-encoder PROPERTIES FOLDER "plugins")
4041

4142
install_obs_plugin_with_data(coreaudio-encoder data)

‎plugins/decklink/linux/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,6 @@ add_library(linux-decklink MODULE
6363
target_link_libraries(linux-decklink
6464
libobs
6565
)
66+
set_target_properties(linux-decklink PROPERTIES FOLDER "plugins")
6667

6768
install_obs_plugin_with_data(linux-decklink ../data)

‎plugins/decklink/mac/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,6 @@ add_library(mac-decklink MODULE
7474
target_link_libraries(mac-decklink
7575
libobs
7676
${COREFOUNDATION})
77+
set_target_properties(mac-decklink PROPERTIES FOLDER "plugins")
7778

7879
install_obs_plugin_with_data(mac-decklink ../data)

‎plugins/decklink/win/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,6 @@ add_library(win-decklink MODULE
6767

6868
target_link_libraries(win-decklink
6969
libobs)
70+
set_target_properties(win-decklink PROPERTIES FOLDER "plugins")
7071

7172
install_obs_plugin_with_data(win-decklink ../data)

‎plugins/enc-amf

‎plugins/image-source/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,6 @@ add_library(image-source MODULE
2222
target_link_libraries(image-source
2323
libobs
2424
${image-source_PLATFORM_DEPS})
25+
set_target_properties(image-source PROPERTIES FOLDER "plugins")
2526

2627
install_obs_plugin_with_data(image-source data)

‎plugins/linux-alsa/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,6 @@ target_link_libraries(linux-alsa
3030
libobs
3131
${ALSA_LIBRARY}
3232
)
33+
set_target_properties(linux-alsa PROPERTIES FOLDER "plugins")
3334

3435
install_obs_plugin_with_data(linux-alsa data)

‎plugins/linux-capture/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,6 @@ target_link_libraries(linux-capture
4747
${X11_Xcomposite_LIB}
4848
${XCB_LIBRARIES}
4949
)
50+
set_target_properties(linux-capture PROPERTIES FOLDER "plugins")
5051

5152
install_obs_plugin_with_data(linux-capture data)

‎plugins/linux-jack/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,6 @@ target_link_libraries(linux-jack
3131
libobs
3232
${JACK_LIBRARIES}
3333
)
34+
set_target_properties(linux-jack PROPERTIES FOLDER "plugins")
3435

3536
install_obs_plugin_with_data(linux-jack data)

‎plugins/linux-pulseaudio/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,6 @@ target_link_libraries(linux-pulseaudio
3131
libobs
3232
${PULSEAUDIO_LIBRARY}
3333
)
34+
set_target_properties(linux-pulseaudio PROPERTIES FOLDER "plugins")
3435

3536
install_obs_plugin_with_data(linux-pulseaudio data)

‎plugins/linux-v4l2/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,6 @@ target_link_libraries(linux-v4l2
4545
${LIBV4L2_LIBRARIES}
4646
${UDEV_LIBRARIES}
4747
)
48+
set_target_properties(linux-v4l2 PROPERTIES FOLDER "plugins")
4849

4950
install_obs_plugin_with_data(linux-v4l2 data)

0 commit comments

Comments
 (0)