diff --git a/cmake/modules/3rdParty.cmake b/cmake/modules/3rdParty.cmake
index 5ea1e84..e3501dd 100644
--- a/cmake/modules/3rdParty.cmake
+++ b/cmake/modules/3rdParty.cmake
@@ -54,7 +54,7 @@ if(NOT DEFINED THIRD_PARTY_MODULE_LOADED)
                 message(STATUS "Adding include path for ${NAME} to ${TARGET_PREFIX}${META_PROJECT_NAME}${TARGET_SUFFIX}: ${${NAME}_STATIC_INCLUDE_DIR}")
             endif()
 
-            if(${NAME} IN_LIST META_PUBLIC_STATIC_LIB_DEPENDS)
+            if(${${NAME}_STATIC_LIB} IN_LIST META_PUBLIC_STATIC_LIB_DEPENDS OR ${NAME} IN_LIST META_PUBLIC_STATIC_LIB_DEPENDS)
                 list(APPEND ${PUBLIC_LIBRARIES_VARNAME} ${${NAME}_STATIC_LIB})
                 if(${NAME}_STATIC_INCLUDE_DIR)
                     list(APPEND PUBLIC_SHARED_INCLUDE_DIRS ${${NAME}_STATIC_INCLUDE_DIR})
@@ -85,7 +85,7 @@ if(NOT DEFINED THIRD_PARTY_MODULE_LOADED)
                 message(STATUS "Adding include path for ${NAME} to ${TARGET_PREFIX}${META_PROJECT_NAME}${TARGET_SUFFIX}: ${${NAME}_DYNAMIC_INCLUDE_DIR}")
             endif()
 
-            if(${NAME} IN_LIST META_PUBLIC_SHARED_LIB_DEPENDS)
+            if(${${NAME}_DYNAMIC_LIB} IN_LIST META_PUBLIC_SHARED_LIB_DEPENDS OR ${NAME} IN_LIST META_PUBLIC_SHARED_LIB_DEPENDS)
                 list(APPEND ${PUBLIC_LIBRARIES_VARNAME} ${${NAME}_DYNAMIC_LIB})
                 if(${NAME}_DYNAMIC_INCLUDE_DIR)
                     list(APPEND PUBLIC_SHARED_INCLUDE_DIRS ${${NAME}_DYNAMIC_INCLUDE_DIR})
@@ -116,7 +116,7 @@ if(NOT DEFINED THIRD_PARTY_MODULE_LOADED)
                 message(STATUS "Adding include path for ${NAME} to static ${TARGET_PREFIX}${META_PROJECT_NAME}${TARGET_SUFFIX}: ${${NAME}_STATIC_INCLUDE_DIR}")
             endif()
 
-            if(${NAME} IN_LIST META_PUBLIC_STATIC_LIB_DEPENDS)
+            if(${${NAME}_STATIC_LIB} IN_LIST META_PUBLIC_STATIC_LIB_DEPENDS OR ${NAME} IN_LIST META_PUBLIC_STATIC_LIB_DEPENDS)
                 list(APPEND ${PUBLIC_STATIC_LIBRARIES_VARNAME} ${${NAME}_STATIC_LIB})
                 if(${NAME}_STATIC_INCLUDE_DIR)
                     list(APPEND PUBLIC_STATIC_INCLUDE_DIRS ${${NAME}_STATIC_INCLUDE_DIR})
@@ -147,7 +147,7 @@ if(NOT DEFINED THIRD_PARTY_MODULE_LOADED)
                 message(STATUS "Adding include path for ${NAME} to static ${TARGET_PREFIX}${META_PROJECT_NAME}${TARGET_SUFFIX}: ${${NAME}_DYNAMIC_INCLUDE_DIR}")
             endif()
 
-            if(${NAME} IN_LIST META_PUBLIC_SHARED_LIB_DEPENDS)
+            if(${${NAME}_DYNAMIC_LIB} IN_LIST META_PUBLIC_SHARED_LIB_DEPENDS OR ${NAME} IN_LIST META_PUBLIC_SHARED_LIB_DEPENDS)
                 list(APPEND ${PUBLIC_STATIC_LIBRARIES_VARNAME} ${${NAME}_DYNAMIC_LIB})
                 if(${NAME}_DYNAMIC_INCLUDE_DIR)
                     list(APPEND PUBLIC_STATIC_INCLUDE_DIRS ${${NAME}_DYNAMIC_INCLUDE_DIR})