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
28afc278
Commit
28afc278
authored
Jul 24, 2019
by
Antoine Regimbeau
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUG: BOOST_SB_CONFIG was overridden
parent
449ea660
Pipeline
#2307
failed with stages
in 71 minutes and 11 seconds
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
SuperBuild/CMake/External_boost.cmake
SuperBuild/CMake/External_boost.cmake
+5
-3
No files found.
SuperBuild/CMake/External_boost.cmake
View file @
28afc278
...
...
@@ -45,7 +45,7 @@ set(BOOST_CONFIGURE_COMMAND ${CMAKE_COMMAND}
# must be passed to b2. Why? Windows... That is why...
# Libraries we need from boost
set
(
boost_libraries_to_build
"system;serialization;filesystem;test;date_time;program_options;thread"
)
message
(
"boost_libraries_to_build =
${
boost_libraries_to_build
}
"
)
# add libraries to b2 option
set
(
BOOST_SB_CONFIG
)
foreach
(
lib
${
boost_libraries_to_build
}
)
...
...
@@ -53,9 +53,12 @@ foreach(lib ${boost_libraries_to_build})
${
BOOST_SB_CONFIG
}
--with-
${
lib
}
)
endforeach
(
lib
)
# I think that this is already handled by boost.
if
(
OTB_TARGET_SYSTEM_ARCH_IS_X64
)
set
(
BOOST_SB_CONFIG address-model=64
)
set
(
BOOST_SB_CONFIG
${
BOOST_SB_CONFIG
}
address-model=64
)
endif
()
set
(
BOOST_SB_CONFIG
...
...
@@ -70,7 +73,6 @@ set(BOOST_SB_CONFIG
# --includedir=${SB_INSTALL_PREFIX}/include #This is the default in boost
# --libdir=${_SB_BOOST_LIBRARYDIR} # same here
set
(
BOOST_BUILD_COMMAND
${
CMAKE_COMMAND
}
-E chdir
${
BOOST_SB_SRC
}
${
BOOST_B2_EXE
}
...
...
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