diff --git a/CMakeLists.txt b/CMakeLists.txt index f502354add05e0610f497c688f431b771b643f00..ab826aa693f4d97b7f5084655212bbe900002cf2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) # Detiq-T is a submodule, it is built automatically before building eiimage if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/lib/detiq-t AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib/detiq-t) add_subdirectory(lib/detiq-t) - include_directories(lib/detiq-t/ImageIn lib/detiq-t/GenericInterface) + include_directories(lib/detiq-t/ImageIn lib/detiq-t/GenericInterface) else() message(FATAL_ERROR "The Detiq-T project should be cloned before excuting this compilation. " "Please use 'git submodule init' and 'git submodule update' to automatically get the source " diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index f970178d9e09cb254775c57cf88ed2c58ce4e713..0858db25ad26e9ad0d22b4b628e12d77b92e1fb8 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -17,7 +17,12 @@ endif() # Find Qwt, which must be built and installed before running this compilation find_package(Qwt 6.0 REQUIRED) -include_directories(${QWT_INCLUDE_DIRS}) +if(QWT_FOUND) + message(STATUS "Qwt library version ${QWT_VERSION_STRING}") + include_directories(${QWT_INCLUDE_DIRS}) +else() + message(FATAL_ERROR "Cannot find Qwt library. Please add the Qwt library directory to CMAKE_PREFIX_PATH.") +endif() set(eiimage_SOURCES main.cpp diff --git a/lib/detiq-t b/lib/detiq-t index 3775c10a581cc3b5b8ad1bcb173a944d7dcae2d0..ac875e918ae41dc00c6fede23711986ca1af8a14 160000 --- a/lib/detiq-t +++ b/lib/detiq-t @@ -1 +1 @@ -Subproject commit 3775c10a581cc3b5b8ad1bcb173a944d7dcae2d0 +Subproject commit ac875e918ae41dc00c6fede23711986ca1af8a14