poliqarp-in-corpus2 sync, bump required version, bump wccl version to 0.0.3

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.0)
 
 set(ver_major "0")
 set(ver_minor "0")
-set(ver_patch "2")
+set(ver_patch "3")
 
 # use some of our own Find* scripts
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeScripts)

CMakeScripts/FindCorpus2.cmake

-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 corpus2 /usr/lib /usr/local/lib) 
+FIND_PATH(Corpus2_INCLUDE_DIR token.h /usr/include/libcorpus2 /usr/local/include/libcorpus2 )
 
-   MARK_AS_ADVANCED(Corpus2_LIBRARY)
-   MARK_AS_ADVANCED(Corpus2_INCLUDE_DIR)
+FIND_LIBRARY(Corpus2_LIBRARY NAMES corpus2 PATH /usr/lib /usr/local/lib) 
+FIND_LIBRARY(Corpus2Poliqarp_LIBRARY NAMES corpus2poliqarp PATH /usr/lib /usr/local/lib) 
+MARK_AS_ADVANCED(Corpus2_LIBRARY)
+MARK_AS_ADVANCED(Corpus2_INCLUDE_DIR)
+MARK_AS_ADVANCED(Corpus2Poliqarp_LIBRARY)
 
-   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 libcorpus2/version.h ${Corpus2_INCLUDE_DIR})
+   set(Corpus2_LIBRARIES ${Corpus2_LIBRARY})
+   if(Corpus2Poliqarp_LIBRARY)
+      set(Corpus2_LIBRARIES ${Corpus2_LIBRARIES} ${Corpus2Poliqarp_LIBRARY})
+   endif(Corpus2Poliqarp_LIBRARY)
+   FIND_FILE(_Corpus2_VERSION_FILE version.h ${Corpus2_INCLUDE_DIR})
    MARK_AS_ADVANCED(_Corpus2_VERSION_FILE)
    IF (_Corpus2_VERSION_FILE)
       FILE(READ ${_Corpus2_VERSION_FILE} _Corpus2_VERSION_CONENTS)
@@ -38,7 +38,11 @@ IF (Corpus2_FOUND)
       ENDIF (Corpus2_VERSION VERSION_LESS Corpus2_FIND_VERSION)
    ENDIF (Corpus2_FIND_VERSION)
    IF (NOT Corpus2_FIND_QUIETLY)
-      MESSAGE(STATUS "Found libcorpus2 ${Corpus2_VERSION}: ${Corpus2_LIBRARY}")
+      IF (NOT Corpus2Poliqarp_LIBRARY)
+         MESSAGE(STATUS "Found libcorpus2 ${Corpus2_VERSION}: ${Corpus2_LIBRARY}")
+      ELSE()
+         MESSAGE(STATUS "Found libcorpus2 ${Corpus2_VERSION}: ${Corpus2_LIBRARY} with PoliqarpLibrary ${Corpus2Poliqarp_LIBRARY}")
+      ENDIF(NOT Corpus2Poliqarp_LIBRARY)
    ENDIF (NOT Corpus2_FIND_QUIETLY)
 ELSE (Corpus2_FOUND)
    IF (Corpus2_FIND_REQUIRED)

libwccl/CMakeLists.txt

@@ -4,8 +4,8 @@ PROJECT(wccl)
 
 include_directories( ${CMAKE_CURRENT_BINARY_DIR}/include/ )
 
-find_package(Corpus2 1.0.8 REQUIRED)
-set(LIBS ${LIBS} ${Corpus2_LIBRARY})
+find_package(Corpus2 1.0.9 REQUIRED)
+set(LIBS ${LIBS} ${Corpus2_LIBRARIES})
 
 find_package(PwrUtils 1.0.1 REQUIRED)
 set(LIBS ${LIBS} ${PwrUtils_LIBRARY})