Skip to content

Commit

Permalink
Revert "COMP: call find_package(OTB) if needed"
Browse files Browse the repository at this point in the history
This reverts commit 2f6bf0d.
  • Loading branch information
gpo-geo committed Jan 19, 2017
1 parent 4afb3b8 commit 18c8bbd
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 13 deletions.
9 changes: 4 additions & 5 deletions Examples/CMakeLists.txt
Expand Up @@ -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 "")
Expand Down Expand Up @@ -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)
Expand Down
11 changes: 3 additions & 8 deletions 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})
Expand Down

0 comments on commit 18c8bbd

Please sign in to comment.