From c6c4aa4634cca296671d7e7c9ea2195ae8dea609 Mon Sep 17 00:00:00 2001 From: polar Date: Thu, 16 Sep 2021 13:59:08 +0100 Subject: [PATCH] cmake corrections (#10782) --- 3rdparty/7z/CMakeLists.txt | 5 +++++ 3rdparty/CMakeLists.txt | 3 +++ 3rdparty/asmjit/CMakeLists.txt | 1 + 3rdparty/curl/CMakeLists.txt | 3 +++ 4 files changed, 12 insertions(+) diff --git a/3rdparty/7z/CMakeLists.txt b/3rdparty/7z/CMakeLists.txt index 43fc3c77b2..cd9094f301 100644 --- a/3rdparty/7z/CMakeLists.txt +++ b/3rdparty/7z/CMakeLists.txt @@ -48,6 +48,11 @@ if(WIN32) target_include_directories(3rdparty_7z INTERFACE $ $) + + target_include_directories(3rdparty_7z INTERFACE 7z) + + set_property(TARGET 3rdparty_7z PROPERTY FOLDER "3rdparty/") + else() add_library(3rdparty_7z INTERFACE) endif() diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index 138cd74dd5..146e70cd7d 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -239,6 +239,9 @@ if(USE_FAUDIO) endif() endif() +set_property(TARGET ${FAUDIO_TARGET} PROPERTY FOLDER "3rdparty/") + + # FFMPEG add_library(3rdparty_ffmpeg INTERFACE) diff --git a/3rdparty/asmjit/CMakeLists.txt b/3rdparty/asmjit/CMakeLists.txt index 2032592584..f1236b2f1b 100644 --- a/3rdparty/asmjit/CMakeLists.txt +++ b/3rdparty/asmjit/CMakeLists.txt @@ -14,4 +14,5 @@ target_link_libraries(asmjit PRIVATE ${ASMJIT_DEPS}) # ASMJIT should have a option for disabling installing and this wouldnt # be required to avoid installing ASMJIT... +set_property(TARGET asmjit PROPERTY FOLDER "3rdparty/") add_library(3rdparty::asmjit ALIAS asmjit) diff --git a/3rdparty/curl/CMakeLists.txt b/3rdparty/curl/CMakeLists.txt index 3cb67e6d20..6e938d22e1 100644 --- a/3rdparty/curl/CMakeLists.txt +++ b/3rdparty/curl/CMakeLists.txt @@ -16,4 +16,7 @@ else() set(CURL_STATIC_CRT ON CACHE BOOL "Use static crt to build curl" FORCE) endif() add_subdirectory(curl EXCLUDE_FROM_ALL) + + set_property(TARGET libcurl PROPERTY FOLDER "3rdparty/") + endif()