From b41e4536c759c2b67ef9d86713b9c03d65c9bb46 Mon Sep 17 00:00:00 2001 From: Caner Candan Date: Wed, 26 Oct 2011 10:19:09 +0200 Subject: [PATCH] * changed cmake config file in order to user FindEO but still works with install.cmake manual config way, disabled application building since there is an issue when compiling --- edo/CMakeLists.txt | 7 ++++++- edo/install.cmake-dist | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/edo/CMakeLists.txt b/edo/CMakeLists.txt index ab4333ef6..10b1fbe23 100644 --- a/edo/CMakeLists.txt +++ b/edo/CMakeLists.txt @@ -28,11 +28,16 @@ SET(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT ### 3) Include useful features ###################################################################################### +# include useful features for cmake +SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) + INCLUDE(FindDoxygen) INCLUDE(FindPkgConfig) FIND_PACKAGE(Boost 1.33.0) +FIND_PACKAGE(EO) + INCLUDE_DIRECTORIES( ${EO_INCLUDE_DIRS} ${MO_INCLUDE_DIRS} @@ -87,7 +92,7 @@ SET(SAMPLE_SRCS) ###################################################################################### ADD_SUBDIRECTORY(src) -ADD_SUBDIRECTORY(application) +#ADD_SUBDIRECTORY(application) ADD_SUBDIRECTORY(test) ADD_SUBDIRECTORY(doc) diff --git a/edo/install.cmake-dist b/edo/install.cmake-dist index 99d4166ba..b4f532113 100644 --- a/edo/install.cmake-dist +++ b/edo/install.cmake-dist @@ -12,7 +12,7 @@ SET(EO_LIBRARIES eoutils eo es ga cma gcov) # do not use quotes around this list SET(MO_INCLUDE_DIRS "${MO_DIR}/src" CACHE PATH "MO include directory" FORCE) SET(MO_LIBRARY_DIRS "${MO_DIR}/release/lib" CACHE PATH "MO library directory" FORCE) -SET(MO_LIBRARIES "mo") +#SET(MO_LIBRARIES "mo") # no library is generated when building MO # ... or rather use pkg-config (dont forget to comment the code above)