Skip to content

Commit

Permalink
PR IntelRealSense#12331 from Eran: move all ExternalProjectTargets in…
Browse files Browse the repository at this point in the history
…to '3rd Party'
  • Loading branch information
maloel authored Oct 29, 2023
2 parents 9ed7daf + 11b51f7 commit 851aed5
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMake/external_catch2.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function(get_catch2)

# place libraries with other 3rd-party projects
set_target_properties( Catch2 Catch2WithMain PROPERTIES
FOLDER "ExternalProjectTargets/catch2" )
FOLDER "3rd Party/catch2" )

message( STATUS "Fetching Catch2 - Done" )

Expand Down
2 changes: 1 addition & 1 deletion CMake/external_fastdds.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ function(get_fastdds)

# place FastDDS project with other 3rd-party projects
set_target_properties(fastcdr fastrtps PROPERTIES
FOLDER "ExternalProjectTargets/fastdds")
FOLDER "3rd Party/fastdds")

list(POP_BACK CMAKE_MESSAGE_INDENT) # Unindent outputs

Expand Down
2 changes: 2 additions & 0 deletions CMake/external_libusb.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ target_include_directories(usb INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINAR
target_link_libraries(usb INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/libusb_install/lib/${CMAKE_STATIC_LIBRARY_PREFIX}usb${CMAKE_STATIC_LIBRARY_SUFFIX})
set(USE_EXTERNAL_USB ON) # INTERFACE libraries can't have real deps, so targets that link with usb need to also depend on libusb

set_target_properties( libusb PROPERTIES FOLDER "3rd Party")

if (APPLE)
find_library(corefoundation_lib CoreFoundation)
find_library(iokit_lib IOKit)
Expand Down
2 changes: 1 addition & 1 deletion CMake/external_pybind11.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ function(get_pybind11)
add_subdirectory( "${CMAKE_BINARY_DIR}/third-party/pybind11"
"${CMAKE_BINARY_DIR}/third-party/pybind11/build" )

set_target_properties( pybind11 PROPERTIES FOLDER "ExternalProjectTargets" )
set_target_properties( pybind11 PROPERTIES FOLDER "3rd Party" )

# Besides pybind11, any python module will also need to be installed using:
# install(
Expand Down
2 changes: 1 addition & 1 deletion third-party/glfw/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ set_target_properties(glfw PROPERTIES
VERSION ${GLFW_VERSION}
SOVERSION ${GLFW_VERSION_MAJOR}
POSITION_INDEPENDENT_CODE ON
FOLDER "GLFW3")
FOLDER "3rd Party")

target_compile_definitions(glfw PRIVATE _GLFW_USE_CONFIG_H)
target_include_directories(glfw PUBLIC
Expand Down

0 comments on commit 851aed5

Please sign in to comment.