From 01a86bb64dd32ecfcbdb78fa4a07ef1c0559c710 Mon Sep 17 00:00:00 2001
From: Adam Wardynski <award@.(win7-laptop)>
Date: Sat, 13 Nov 2010 22:22:42 +0100
Subject: [PATCH] Tweak find scripts to signify includes are like
<libcorpus2/XXX.h> not just <XXX.h>
---
CMakeScripts/FindCorpus2.cmake | 19 ++++++++++++-------
CMakeScripts/FindPwrUtils.cmake | 20 +++++++++++++-------
2 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/CMakeScripts/FindCorpus2.cmake b/CMakeScripts/FindCorpus2.cmake
index 1d91852..da71090 100644
--- a/CMakeScripts/FindCorpus2.cmake
+++ b/CMakeScripts/FindCorpus2.cmake
@@ -1,19 +1,24 @@
-FIND_PATH(Corpus2_INCLUDE_DIR token.h /usr/include/libcorpus2 /usr/local/include/libcorpus2 )
+IF (Corpus2_INCLUDE_DIR AND Corpus2_LIBRARY)
+#Already in cache
+ SET(Corpus2_FOUND TRUE)
+ELSE (Corpus2_INCLUDE_DIR AND Corpus2_LIBRARY)
+ FIND_PATH(Corpus2_INCLUDE_DIR libcorpus2/token.h /usr/include /usr/local/include)
-FIND_LIBRARY(Corpus2_LIBRARY NAMES corpus2 PATH /usr/lib /usr/local/lib)
+ FIND_LIBRARY(Corpus2_LIBRARY corpus2 /usr/lib /usr/local/lib)
-MARK_AS_ADVANCED(Corpus2_LIBRARY)
-MARK_AS_ADVANCED(Corpus2_INCLUDE_DIR)
+ MARK_AS_ADVANCED(Corpus2_LIBRARY)
+ MARK_AS_ADVANCED(Corpus2_INCLUDE_DIR)
+ IF (Corpus2_INCLUDE_DIR AND Corpus2_LIBRARY)
+ SET(Corpus2_FOUND TRUE)
+ ENDIF (Corpus2_INCLUDE_DIR AND Corpus2_LIBRARY)
-IF (Corpus2_INCLUDE_DIR AND Corpus2_LIBRARY)
- SET(Corpus2_FOUND TRUE)
ENDIF (Corpus2_INCLUDE_DIR AND Corpus2_LIBRARY)
IF (Corpus2_FOUND)
set(Corpus2_VERSION 0.0.0)
- FIND_FILE(_Corpus2_VERSION_FILE version.h ${Corpus2_INCLUDE_DIR})
+ FIND_FILE(_Corpus2_VERSION_FILE libcorpus2/version.h ${Corpus2_INCLUDE_DIR})
MARK_AS_ADVANCED(_Corpus2_VERSION_FILE)
IF (_Corpus2_VERSION_FILE)
FILE(READ ${_Corpus2_VERSION_FILE} _Corpus2_VERSION_CONENTS)
diff --git a/CMakeScripts/FindPwrUtils.cmake b/CMakeScripts/FindPwrUtils.cmake
index 62e25bb..858e922 100644
--- a/CMakeScripts/FindPwrUtils.cmake
+++ b/CMakeScripts/FindPwrUtils.cmake
@@ -1,18 +1,24 @@
-FIND_PATH(PwrUtils_INCLUDE_DIR foreach.h /usr/include/libpwrutils /usr/local/include/libpwrutils )
+IF (PwrUtils_INCLUDE_DIR AND PwrUtils_LIBRARY)
+#already in cache
+ SET(PwrUtils_FOUND TRUE)
+ELSE (PwrUtils_INCLUDE_DIR AND PwrUtils_LIBRARY)
-FIND_LIBRARY(PwrUtils_LIBRARY NAMES pwrutils PATH /usr/lib /usr/local/lib)
+ FIND_PATH(PwrUtils_INCLUDE_DIR libpwrutils/foreach.h /usr/include /usr/local/include )
-MARK_AS_ADVANCED(PwrUtils_LIBRARY)
-MARK_AS_ADVANCED(PwrUtils_INCLUDE_DIR)
+ FIND_LIBRARY(PwrUtils_LIBRARY pwrutils /usr/lib /usr/local/lib)
+ MARK_AS_ADVANCED(PwrUtils_LIBRARY)
+ MARK_AS_ADVANCED(PwrUtils_INCLUDE_DIR)
-IF (PwrUtils_INCLUDE_DIR AND PwrUtils_LIBRARY)
- SET(PwrUtils_FOUND TRUE)
+ IF (PwrUtils_INCLUDE_DIR AND PwrUtils_LIBRARY)
+ SET(PwrUtils_FOUND TRUE)
+ ENDIF (PwrUtils_INCLUDE_DIR AND PwrUtils_LIBRARY)
ENDIF (PwrUtils_INCLUDE_DIR AND PwrUtils_LIBRARY)
+
IF (PwrUtils_FOUND)
set(PwrUtils_VERSION 0.0.0)
- FIND_FILE(_PwrUtils_VERSION_FILE version.h ${PwrUtils_INCLUDE_DIR})
+ FIND_FILE(_PwrUtils_VERSION_FILE libpwrutils/version.h ${PwrUtils_INCLUDE_DIR})
MARK_AS_ADVANCED(_PwrUtils_VERSION_FILE)
IF (_PwrUtils_VERSION_FILE)
FILE(READ ${_PwrUtils_VERSION_FILE} _PwrUtils_VERSION_CONENTS)
--
GitLab