* 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
This commit is contained in:
parent
825b1f4273
commit
b41e4536c7
2 changed files with 7 additions and 2 deletions
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
Reference in a new issue