From bef42e89ef9fac7920af6ce40b74a1ff39352a9b Mon Sep 17 00:00:00 2001 From: dpasukhi Date: Sun, 26 Jan 2025 18:29:45 +0000 Subject: [PATCH] Revert "Configuration - Single config lib direct linking #289" This reverts commit 81a807b6cf5704f39379fc7bcabd6a61a63c7eed. --- adm/cmake/occt_macros.cmake | 5 ----- 1 file changed, 5 deletions(-) diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake index 605c614930..efef453612 100644 --- a/adm/cmake/occt_macros.cmake +++ b/adm/cmake/occt_macros.cmake @@ -768,7 +768,6 @@ function (PROCESS_CSF_LIBRARIES CURRENT_CSF LIST_NAME TARGET_NAME) string (REGEX MATCHALL "(^|;)3RDPARTY_[^;]+_LIBRARY[^;]*" ALL_CACHE_VARIABLES "${ALL_CACHE_VARIABLES}") set (DEBUG_DIR "") set (RELEASE_DIR "") - set (LAST_DETECTED_LIBRARY "") foreach (CACHE_VARIABLE ${ALL_CACHE_VARIABLES}) set (CURRENT_CACHE_LIBRARY ${${CACHE_VARIABLE}}) string (TOLOWER "${CACHE_VARIABLE}" CACHE_VARIABLE) @@ -783,7 +782,6 @@ function (PROCESS_CSF_LIBRARIES CURRENT_CSF LIST_NAME TARGET_NAME) "3rdparty_${CSF_WO_VERSION}_library" STREQUAL "${CACHE_VARIABLE}" OR NOT "x${IS_ENDING}" STREQUAL "x" OR NOT "x${IS_ENDING_WO_VERSION}" STREQUAL "x") - set (LAST_DETECTED_LIBRARY "${CURRENT_CACHE_LIBRARY}") get_filename_component(LIBRARY_NAME "${CURRENT_CACHE_LIBRARY}" NAME) list (APPEND FOUND_LIBS "${LIBRARY_NAME}") get_filename_component(LIBRARY_DIR "${CURRENT_CACHE_LIBRARY}" DIRECTORY) @@ -791,7 +789,6 @@ function (PROCESS_CSF_LIBRARIES CURRENT_CSF LIST_NAME TARGET_NAME) set (LIBRARY_FROM_CACHE 1) elseif ("3rdparty_${CSF_LIBRARY}_library_debug" STREQUAL "${CACHE_VARIABLE}" OR "3rdparty_${CSF_LIBRARY}_debug_library" STREQUAL "${CACHE_VARIABLE}") - set (LAST_DETECTED_LIBRARY "${CURRENT_CACHE_LIBRARY}") get_filename_component(LIBRARY_NAME "${CURRENT_CACHE_LIBRARY}" NAME) list (APPEND FOUND_LIBS "${LIBRARY_NAME}") get_filename_component(LIBRARY_DIR "${CURRENT_CACHE_LIBRARY}" DIRECTORY) @@ -810,8 +807,6 @@ function (PROCESS_CSF_LIBRARIES CURRENT_CSF LIST_NAME TARGET_NAME) if (DEBUG_DIR AND RELEASE_DIR) list (APPEND FOUND_DEBUG_DIRS "${DEBUG_DIR}") list (APPEND FOUND_RELEASE_DIRS "${RELEASE_DIR}") - elseif (EXISTS "${LAST_DETECTED_LIBRARY}") - list (APPEND FOUND_DEBUG_DIRS "${LAST_DETECTED_LIBRARY}") elseif (DEBUG_DIR) list (APPEND FOUND_DEBUG_DIRS "${DEBUG_DIR}") list (APPEND FOUND_RELEASE_DIRS "${DEBUG_DIR}")