diff --git a/CommonPackage.cmake b/CommonPackage.cmake
index f898c2c..76ee961 100644
--- a/CommonPackage.cmake
+++ b/CommonPackage.cmake
@@ -132,20 +132,25 @@ macro(common_package Package_Name)
     endif()
     set(${PROJECT_NAME}_FIND_PACKAGES_FOUND
       "${${PROJECT_NAME}_FIND_PACKAGES_FOUND} ${Package_Name}")
-    link_directories(${${${Package_Name}_name}_LIBRARY_DIRS})
-    if(NOT "${${${Package_Name}_name}_INCLUDE_DIRS}" MATCHES "-NOTFOUND")
-      if(__is_system_package)
-        include_directories(BEFORE SYSTEM ${${${Package_Name}_name}_INCLUDE_DIRS})
-      else()
-        include_directories(${${${Package_Name}_name}_INCLUDE_DIRS})
-      endif()
+    set(__library_dirs ${Package_Name}_LIBRARY_DIRS ${PACKAGE_NAME}_LIBRARY_DIRS)
+    link_directories( ${__library_dirs} )
+    set(__include_dirs)
+    if(NOT "${${Package_Name}_INCLUDE_DIRS}" MATCHES "-NOTFOUND")
+      list(APPEND __include_dirs ${${Package_Name}_INCLUDE_DIRS})
     endif()
-    if(NOT "${${${Package_Name}_name}_INCLUDE_DIR}" MATCHES "-NOTFOUND")
-      if(__is_system_package)
-        include_directories(BEFORE SYSTEM ${${${Package_Name}_name}_INCLUDE_DIR})
-      else()
-        include_directories(${${${Package_Name}_name}_INCLUDE_DIR})
-      endif()
+    if(NOT "${${PACKAGE_NAME}_INCLUDE_DIRS}" MATCHES "-NOTFOUND")
+      list(APPEND __include_dirs ${${PACKAGE_NAME}_INCLUDE_DIRS})
+    endif()
+    if(NOT "${${Package_Name}_INCLUDE_DIR}" MATCHES "-NOTFOUND")
+      list(APPEND __include_dirs ${${Package_Name}_INCLUDE_DIR}) 
+    endif()
+    if(NOT "${${PACKAGE_NAME}_INCLUDE_DIR}" MATCHES "-NOTFOUND")
+      list(APPEND __include_dirs ${${PACKAGE_NAME}_INCLUDE_DIR}) 
+    endif()
+    if(__is_system_package)
+      include_directories(BEFORE SYSTEM ${__include_dirs})
+    else()
+      include_directories(${__include_dirs})
     endif()
   endif()
 endmacro()