Merge pull request #7 from v4hn/wrong_foundation_check

Poco detection is too confident when seeing /usr/include/Foundation
ros · May 22, 2013 · 00b6930 · 00b6930
2 parents 547a4c3 + 0fe94c4
commit 00b6930
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cmake/FindPoco.cmake b/cmake/FindPoco.cmake
@@ -100,7 +100,7 @@ SET(SUFFIX_FOR_LIBRARY_PATH
 #
 # Look for an installation.
 #
-FIND_PATH(Poco_INCLUDE_DIR NAMES Foundation/include/Poco/AbstractCache.h PATH_SUFFIXES ${SUFFIX_FOR_INCLUDE_PATH} PATHS
+FIND_PATH(Poco_INCLUDE_DIR NAMES Foundation/include/Poco/SharedLibrary.h PATH_SUFFIXES ${SUFFIX_FOR_INCLUDE_PATH} PATHS
 
 # Look in other places.
   ${POCO_DIR_SEARCH}
@@ -121,7 +121,7 @@ SET(Poco_FOUND 0)
 
 # Now try to get the include and library path.
 IF(Poco_INCLUDE_DIR)
-  IF(EXISTS "${Poco_INCLUDE_DIR}/Foundation")
+  IF(EXISTS "${Poco_INCLUDE_DIR}/Foundation/include/Poco/SharedLibrary.h")
     SET(Poco_INCLUDE_DIRS
       ${Poco_INCLUDE_DIR}/CppUnit/include
       ${Poco_INCLUDE_DIR}/Foundation/include

diff --git a/cmake/PocoConfig.cmake b/cmake/PocoConfig.cmake
@@ -100,7 +100,7 @@ SET(SUFFIX_FOR_LIBRARY_PATH
 #
 # Look for an installation.
 #
-FIND_PATH(Poco_INCLUDE_DIR NAMES Foundation/include/Poco/AbstractCache.h PATH_SUFFIXES ${SUFFIX_FOR_INCLUDE_PATH} PATHS
+FIND_PATH(Poco_INCLUDE_DIR NAMES Foundation/include/Poco/SharedLibrary.h PATH_SUFFIXES ${SUFFIX_FOR_INCLUDE_PATH} PATHS
 
 # Look in other places.
   ${POCO_DIR_SEARCH}
@@ -121,7 +121,7 @@ SET(Poco_FOUND 0)
 
 # Now try to get the include and library path.
 IF(Poco_INCLUDE_DIR)
-  IF(EXISTS "${Poco_INCLUDE_DIR}/Foundation")
+  IF(EXISTS "${Poco_INCLUDE_DIR}/Foundation/include/Poco/SharedLibrary.h")
     SET(Poco_INCLUDE_DIRS
       ${Poco_INCLUDE_DIR}/CppUnit/include
       ${Poco_INCLUDE_DIR}/Foundation/include