From 8b8983e9a185df597db73f7f9f1d4f03a5961828 Mon Sep 17 00:00:00 2001 From: ilor <kailoran@gmail.com> Date: Thu, 12 May 2011 16:26:28 +0200 Subject: [PATCH] fix self-dependency in swig cmake, reenable swig in main cmakelists --- CMakeLists.txt | 2 +- swig/CMakeLists.txt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 952c9de..55f0fe3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,5 +67,5 @@ add_subdirectory(libpwrutils) add_subdirectory(libcorpus2) add_subdirectory(tagset-tool) add_subdirectory(tests) -# add_subdirectory(swig) +add_subdirectory(swig) diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt index 978ece1..d1696e5 100644 --- a/swig/CMakeLists.txt +++ b/swig/CMakeLists.txt @@ -2,11 +2,11 @@ PROJECT(corpus2SwigWrap) -find_package(Corpus2 1.0.8 REQUIRED) -set(CORPUS2_LIBS ${Corpus2_LIBRARY}) +#find_package(Corpus2 1.0.8 REQUIRED) +set(CORPUS2_LIBS corpus2) -find_package(PwrUtils 1.0.1 REQUIRED) -set(PWRUTILS_LIBS ${PwrUtils_LIBRARY}) +#find_package(PwrUtils 1.0.1 REQUIRED) +set(PWRUTILS_LIBS pwrutils) set(CORPUS2_PWR_LIBS ${CORPUS2_LIBS} ${PWRUTILS_LIBS}) include_directories (${Libcorpus2_SOURCE_DIR} "../libcorpus2") -- GitLab