From 18c8bbd39b9a89f08a894c7f3ffea458439d3861 Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Thu, 19 Jan 2017 18:18:32 +0100
Subject: [PATCH] Revert "COMP: call find_package(OTB) if needed"
This reverts commit 2f6bf0da2c30c087a277afdde20c867560005109.
---
Examples/CMakeLists.txt | 9 ++++-----
Utilities/Completion/CMakeLists.txt | 11 +++--------
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt
index 94ebcd0d4b..04b570526e 100644
--- a/Examples/CMakeLists.txt
+++ b/Examples/CMakeLists.txt
@@ -10,16 +10,11 @@ endif()
#check if this is a standalone build?
-find_package(OTB REQUIRED)
-message(STATUS "[Examples] Found OTB: ${OTB_USE_FILE}")
-
if(PROJECT_NAME STREQUAL "OTBExamples")
if(BUILD_TESTING)
include(CTest)
endif()
- include(${OTB_USE_FILE})
-
# dashboard build. Why do I need to see the deprecated warnings on dashboard!
# It just fades the actual warnings and most importantly very annoying.
if(NOT "$ENV{DASHBOARD_TEST_FROM_CTEST}" STREQUAL "")
@@ -140,6 +135,10 @@ else()
include(${CMAKE_CURRENT_SOURCE_DIR}/../CMake/OTBManageLargeInputPaths.cmake)
endif()
+find_package(OTB REQUIRED)
+include(${OTB_USE_FILE})
+message(STATUS "Found OTB: ${OTB_USE_FILE}")
+
set(OTB_TEST_DRIVER otbTestDriver)
if(OTBApplicationEngine_LOADED)
diff --git a/Utilities/Completion/CMakeLists.txt b/Utilities/Completion/CMakeLists.txt
index fc9f4f9d38..7647a6916d 100644
--- a/Utilities/Completion/CMakeLists.txt
+++ b/Utilities/Completion/CMakeLists.txt
@@ -1,11 +1,6 @@
-##### check if standalone project ######
-if(NOT PROJECT_NAME)
- cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR)
- project(OTBCompletion)
- find_package(OTB REQUIRED)
- message("OTBCompletion")
- include(${OTB_USE_FILE})
-endif()
+
+find_package(OTB REQUIRED)
+include(${OTB_USE_FILE})
add_executable(completionGenerator EXCLUDE_FROM_ALL completionGenerator.cxx)
target_link_libraries(completionGenerator ${OTB_LIBRARIES})
--
GitLab