From 641d95313a2c2328c087ccb1e7c7e62973bca454 Mon Sep 17 00:00:00 2001 From: Vidur Date: Tue, 1 Jul 2025 16:25:07 -0500 Subject: [PATCH] Remove installing glfw3 headers --- simulate/CMakeLists.txt | 18 +----------------- simulate/cmake/SimulateDependencies.cmake | 19 ------------------- 2 files changed, 1 insertion(+), 36 deletions(-) diff --git a/simulate/CMakeLists.txt b/simulate/CMakeLists.txt index 96330194..f2a58a08 100644 --- a/simulate/CMakeLists.txt +++ b/simulate/CMakeLists.txt @@ -90,7 +90,7 @@ if(NOT TARGET lodepng) GIT_REPOSITORY https://github.com/lvandeve/lodepng.git GIT_TAG ${MUJOCO_DEP_VERSION_lodepng} ) - + FetchContent_GetProperties(lodepng) if(NOT lodepng_POPULATED) FetchContent_Populate(lodepng) @@ -270,21 +270,5 @@ if(SIMULATE_BUILD_EXECUTABLE) PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/simulate" COMPONENT simulate ) endif() - - if(NOT MUJOCO_SIMULATE_USE_SYSTEM_GLFW) - # We downloaded GLFW. Depending if it is a static or shared LIBRARY we might - # need to install it. - get_target_property(MJ_GLFW_LIBRARY_TYPE glfw TYPE) - if(MJ_GLFW_LIBRARY_TYPE STREQUAL SHARED_LIBRARY) - install( - TARGETS glfw - EXPORT ${PROJECT_NAME} - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT simulate - LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT simulate - ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT simulate - PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" COMPONENT simulate - ) - endif() - endif() endif() endif() diff --git a/simulate/cmake/SimulateDependencies.cmake b/simulate/cmake/SimulateDependencies.cmake index 9ba1d5e8..6a97802f 100644 --- a/simulate/cmake/SimulateDependencies.cmake +++ b/simulate/cmake/SimulateDependencies.cmake @@ -103,22 +103,3 @@ if(NOT SIMULATE_STANDALONE) target_link_options(glfw PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS}) endif() - -message(STATUS "lolwaGLFW3 Source Directory: ${glfw3_SOURCE_DIR}") - -# Install GLFW headers if not using system GLFW -if(NOT MUJOCO_SIMULATE_USE_SYSTEM_GLFW) - FetchContent_GetProperties(glfw3) - if(NOT glfw3_POPULATED) - message(FATAL_ERROR "GLFW3 not populated") - endif() - - install( - DIRECTORY ${glfw3_SOURCE_DIR}/include/GLFW - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - COMPONENT simulate - FILES_MATCHING PATTERN "*.h" - PATTERN "CMake*" EXCLUDE - PATTERN ".git*" EXCLUDE - ) -endif()