From 2c6481bb19f0a544abd15207777737f932b5dde4 Mon Sep 17 00:00:00 2001 From: Antoine Pazat <antoine.pazat@gmail.com> Date: Fri, 1 Jul 2016 09:55:08 +0200 Subject: [PATCH] Modifications chemin Qwt dans les CMakeLists --- CMakeLists.txt | 8 ++++---- lib/detiq-t | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9657a6b..0bb7267 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ project(ImageINSA) cmake_minimum_required(VERSION 2.8.11) -set(CMAKE_BUILD_TYPE "Release") +set(CMAKE_BUILD_TYPE "Debug") # Find includes in corresponding build directories set(CMAKE_INCLUDE_CURRENT_DIR ON) # Instruct CMake to run moc automatically when needed. @@ -77,9 +77,9 @@ find_package(Threads REQUIRED) # Simple inclusion, more control have already been performed # in previous Detiq-T lookup (GenericInterface) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) -set(CMAKE_PREFIX_PATH "C:\\Qwt-6.1.2\\") -set(QWT_LIBRARY "C:\\Qwt-6.1.2\\lib\\qwt.dll") -set(QWT_INCLUDE_DIR "C:\\Qwt-6.1.2\\include") +set(CMAKE_PREFIX_PATH "C:\\Qt\\Qwt-6.1.2\\") +set(QWT_LIBRARY "C:\\Qt\\Qwt-6.1.2\\lib\\qwt.dll") +set(QWT_INCLUDE_DIR "C:\\Qt\\Qwt-6.1.2\\include") find_package(Qwt 6.0 REQUIRED) include_directories(${QWT_INCLUDE_DIRS}) diff --git a/lib/detiq-t b/lib/detiq-t index cbacd87..882e2a5 160000 --- a/lib/detiq-t +++ b/lib/detiq-t @@ -1 +1 @@ -Subproject commit cbacd87b1d5f491bf89f575c8a747a715b7528c5 +Subproject commit 882e2a5550fd91f2bcf8d1815befec97f0b0d7e8 -- GitLab