Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Main Repositories
otb
Commits
07860977
Commit
07860977
authored
Apr 28, 2016
by
Rashad Kanavath
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PKG: check FOUND_ to avoid searching executable again
parent
7f6257d4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
11 deletions
+13
-11
SuperBuild/Packaging/PackageHelper.cmake
SuperBuild/Packaging/PackageHelper.cmake
+13
-11
No files found.
SuperBuild/Packaging/PackageHelper.cmake
View file @
07860977
...
...
@@ -48,9 +48,9 @@ macro(super_package)
list
(
APPEND PKG_SEARCHDIRS
"
${
OTB_INSTALL_DIR
}
/bin"
)
#otbApplicationLauncherCommandLine..
list
(
APPEND PKG_SEARCHDIRS
"
${
OTB_APPLICATIONS_DIR
}
"
)
#otb apps
set
(
EXE_SEARCH
_
DIRS
${
OTB_INSTALL_DIR
}
/bin
)
list
(
APPEND EXE_SEARCH
_
DIRS
${
MONTEVERDI_INSTALL_DIR
}
/bin
)
list
(
APPEND EXE_SEARCH
_
DIRS
${
DEPENDENCIES_INSTALL_DIR
}
/bin
)
set
(
EXE_SEARCHDIRS
${
OTB_INSTALL_DIR
}
/bin
)
list
(
APPEND EXE_SEARCHDIRS
${
MONTEVERDI_INSTALL_DIR
}
/bin
)
list
(
APPEND EXE_SEARCHDIRS
${
DEPENDENCIES_INSTALL_DIR
}
/bin
)
empty_package_staging_directory
()
...
...
@@ -450,16 +450,18 @@ function(configure_package)
list
(
APPEND EXE_FILES
"otbTestDriver"
)
list
(
APPEND EXE_FILES
"monteverdi"
)
list
(
APPEND EXE_FILES
"mapla"
)
foreach
(
EXE_FILE
${
EXE_FILES
}
)
set
(
FOUND_
${
EXE_FILE
}
FALSE
)
foreach
(
EXE_SEARCH_DIR
${
EXE_SEARCH_DIRS
}
)
if
(
EXISTS
"
${
EXE_SEARCH_DIR
}
/
${
EXE_FILE
}${
EXE_EXT
}
"
)
set
(
FOUND_
${
EXE_FILE
}
TRUE
)
#see the first comment about VAR_IN_PKGSETUP_CONFIGURE
set
(
VAR_IN_PKGSETUP_CONFIGURE
"
${
VAR_IN_PKGSETUP_CONFIGURE
}
bin/
${
EXE_FILE
}${
EXE_EXT
}
"
)
list
(
APPEND PKG_PEFILES
"
${
EXE_SEARCH_DIR
}
/
${
EXE_FILE
}${
EXE_EXT
}
"
)
endif
()
foreach
(
EXE_SEARCHDIR
${
EXE_SEARCHDIRS
}
)
if
(
NOT FOUND_
${
EXE_FILE
}
)
if
(
EXISTS
"
${
EXE_SEARCHDIR
}
/
${
EXE_FILE
}${
EXE_EXT
}
"
)
set
(
FOUND_
${
EXE_FILE
}
TRUE
)
#see the first comment about VAR_IN_PKGSETUP_CONFIGURE
set
(
VAR_IN_PKGSETUP_CONFIGURE
"
${
VAR_IN_PKGSETUP_CONFIGURE
}
bin/
${
EXE_FILE
}${
EXE_EXT
}
"
)
list
(
APPEND PKG_PEFILES
"
${
EXE_SEARCHDIR
}
/
${
EXE_FILE
}${
EXE_EXT
}
"
)
endif
()
endif
()
#(NOT FOUND_${EXE_FILE})
endforeach
()
#EXE_SEARCH_DIR
endforeach
()
...
...
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