From d34f65d5977e8a2b22c952054447c87a3992f141 Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Mon, 19 May 2025 17:08:16 +0000 Subject: [PATCH] Remove symlinks of unversioned engine libraries Signed-off-by: Ian Chen --- ogre/src/CMakeLists.txt | 9 --------- ogre2/src/CMakeLists.txt | 12 +----------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/ogre/src/CMakeLists.txt b/ogre/src/CMakeLists.txt index a90a054e5..f7c417752 100644 --- a/ogre/src/CMakeLists.txt +++ b/ogre/src/CMakeLists.txt @@ -55,18 +55,9 @@ if(WIN32) $ ${CMAKE_CURRENT_BINARY_DIR}) endif() -set (versioned ${CMAKE_SHARED_LIBRARY_PREFIX}${PROJECT_NAME_LOWER}-${engine_name}${CMAKE_SHARED_LIBRARY_SUFFIX}) -set (unversioned ${CMAKE_SHARED_LIBRARY_PREFIX}${PROJECT_NAME_NO_VERSION_LOWER}-${engine_name}${CMAKE_SHARED_LIBRARY_SUFFIX}) - if (WIN32) # disable MSVC inherit via dominance warning set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4250") - INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy - ${GZ_RENDERING_ENGINE_INSTALL_DIR}\/${versioned} - ${GZ_RENDERING_ENGINE_INSTALL_DIR}\/${unversioned})") -else() - EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${versioned} ${unversioned}) - INSTALL(FILES ${PROJECT_BINARY_DIR}/${unversioned} DESTINATION ${GZ_RENDERING_ENGINE_RELATIVE_INSTALL_DIR}) endif() add_subdirectory(media) diff --git a/ogre2/src/CMakeLists.txt b/ogre2/src/CMakeLists.txt index 95ff30c04..e5eb2314d 100644 --- a/ogre2/src/CMakeLists.txt +++ b/ogre2/src/CMakeLists.txt @@ -17,7 +17,7 @@ set(engine_name "ogre2") gz_add_component(${engine_name} SOURCES ${sources} GET_TARGET_NAME ogre2_target) set(OGRE2_RESOURCE_PATH_STR "${OGRE2_RESOURCE_PATH}") -# On non-Windows, we need to convert the CMake list delimited (;) to the +# On non-Windows, we need to convert the CMake list delimited (;) to the # list delimiter used in list of paths in code (:) # On Windows, the list delimiter in code is already ;, not need to change it to : if(NOT WIN32) @@ -76,22 +76,12 @@ endif() # https://github.com/OGRECave/ogre-next/blob/003f51a0a90d1cf93fbea3c7302565b07c4f87b0/OgreMain/include/OgrePlatform.h#L350-L372 # target_compile_definitions(${ogre2_target} PRIVATE $<$:DEBUG=1 _DEBUG=1>) - -set (versioned ${CMAKE_SHARED_LIBRARY_PREFIX}${PROJECT_NAME_LOWER}-${engine_name}${CMAKE_SHARED_LIBRARY_SUFFIX}) -set (unversioned ${CMAKE_SHARED_LIBRARY_PREFIX}${PROJECT_NAME_NO_VERSION_LOWER}-${engine_name}${CMAKE_SHARED_LIBRARY_SUFFIX}) - # Note that plugins are currently being installed in 2 places: /lib and the engine-plugins dir install(TARGETS ${ogre2_target} DESTINATION ${GZ_RENDERING_ENGINE_RELATIVE_INSTALL_DIR}) if (WIN32) # disable MSVC inherit via dominance warning set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4250") - INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy - ${GZ_RENDERING_ENGINE_INSTALL_DIR}\/${versioned} - ${GZ_RENDERING_ENGINE_INSTALL_DIR}\/${unversioned})") -else() - EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${versioned} ${unversioned}) - INSTALL(FILES ${PROJECT_BINARY_DIR}/${unversioned} DESTINATION ${GZ_RENDERING_ENGINE_RELATIVE_INSTALL_DIR}) endif() if (NOT (APPLE OR WIN32))