Remove installing glfw3 headers
This commit is contained in:
+1
-17
@@ -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()
|
||||
|
||||
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user