diff --git a/adm/cmake/jemalloc.cmake b/adm/cmake/jemalloc.cmake index 5ee8bbc67e..752de06385 100644 --- a/adm/cmake/jemalloc.cmake +++ b/adm/cmake/jemalloc.cmake @@ -34,9 +34,8 @@ function (JEMALLOC_LIB_SEARCH MMGR_LIB PREFIX) endif() set (JEMALLOC_IS_STATIC_LIB ("${PREFIX}" STREQUAL "STATIC")) if (${JEMALLOC_IS_STATIC_LIB}) - get_filename_component(STATIC_LIB_NAME ${3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB}} NAME) set (OLD_CSF_MMGR ${CSF_MMGR}) - list (APPEND OLD_CSF_MMGR "${STATIC_LIB_NAME}") + list (APPEND OLD_CSF_MMGR "${3RDPARTY_JEMALLOC_LIBRARY_${PREFIX}_${MMGR_LIB}}") set (CSF_MMGR "${OLD_CSF_MMGR}" PARENT_SCOPE) endif() # install instructions diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake index cd154c3419..5076bfd27e 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 (BOTH_DIR "") foreach (CACHE_VARIABLE ${ALL_CACHE_VARIABLES}) set (CURRENT_CACHE_LIBRARY ${${CACHE_VARIABLE}}) string (TOLOWER "${CACHE_VARIABLE}" CACHE_VARIABLE) @@ -815,9 +814,6 @@ function (PROCESS_CSF_LIBRARIES CURRENT_CSF LIST_NAME TARGET_NAME) elseif (RELEASE_DIR) list (APPEND FOUND_DEBUG_DIRS "${RELEASE_DIR}") list (APPEND FOUND_RELEASE_DIRS "${RELEASE_DIR}") - elseif (BOTH_DIR) - list (APPEND FOUND_DEBUG_DIRS "${BOTH_DIR}") - list (APPEND FOUND_RELEASE_DIRS "${BOTH_DIR}") endif() endforeach()