Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Main Repositories
otb
Commits
18c8bbd3
Commit
18c8bbd3
authored
Jan 19, 2017
by
Guillaume Pasero
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "COMP: call find_package(OTB) if needed"
This reverts commit
2f6bf0da
.
parent
4afb3b81
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
13 deletions
+7
-13
Examples/CMakeLists.txt
Examples/CMakeLists.txt
+4
-5
Utilities/Completion/CMakeLists.txt
Utilities/Completion/CMakeLists.txt
+3
-8
No files found.
Examples/CMakeLists.txt
View file @
18c8bbd3
...
...
@@ -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
)
...
...
Utilities/Completion/CMakeLists.txt
View file @
18c8bbd3
##### 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
}
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment