Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
otb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Main Repositories
otb
Commits
e3aa3f9b
Commit
e3aa3f9b
authored
7 years ago
by
Guillaume Pasero
Browse files
Options
Downloads
Patches
Plain Diff
BUG: Mantis-1460: try to avoid usage of LD_LIBRARY_PATH on Linux SuperBuild
parent
f19c8407
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
SuperBuild/CMakeLists.txt
+2
-12
2 additions, 12 deletions
SuperBuild/CMakeLists.txt
with
2 additions
and
12 deletions
SuperBuild/CMakeLists.txt
+
2
−
12
View file @
e3aa3f9b
...
...
@@ -222,18 +222,8 @@ else()
endif
()
if
(
UNIX
)
if
(
APPLE
)
set
(
SB_CMAKE_COMMAND env CC=
${
CMAKE_C_COMPILER
}
CXX=
${
CMAKE_CXX_COMPILER
}
${
CMAKE_COMMAND
}
${
SB_CMAKE_ARGS
}
)
set
(
SB_ENV_CONFIGURE_CMD env CC=
${
CMAKE_C_COMPILER
}
CXX=
${
CMAKE_CXX_COMPILER
}
)
else
()
if
(
DEFINED ENV{LD_LIBRARY_PATH}
)
set
(
LD_LIBRARY_PATH_VALUE
${
SB_INSTALL_PREFIX
}
/lib:$ENV{LD_LIBRARY_PATH}
)
else
()
set
(
LD_LIBRARY_PATH_VALUE
${
SB_INSTALL_PREFIX
}
/lib
)
endif
()
set
(
SB_ENV_CONFIGURE_CMD env LD_LIBRARY_PATH=
${
LD_LIBRARY_PATH_VALUE
}
CC=
${
CMAKE_C_COMPILER
}
CXX=
${
CMAKE_CXX_COMPILER
}
)
set
(
SB_CMAKE_COMMAND env LD_LIBRARY_PATH=
${
LD_LIBRARY_PATH_VALUE
}
CC=
${
CMAKE_C_COMPILER
}
CXX=
${
CMAKE_CXX_COMPILER
}
${
CMAKE_COMMAND
}
${
SB_CMAKE_ARGS
}
)
endif
()
set
(
SB_CMAKE_COMMAND env CC=
${
CMAKE_C_COMPILER
}
CXX=
${
CMAKE_CXX_COMPILER
}
${
CMAKE_COMMAND
}
${
SB_CMAKE_ARGS
}
)
set
(
SB_ENV_CONFIGURE_CMD env CC=
${
CMAKE_C_COMPILER
}
CXX=
${
CMAKE_CXX_COMPILER
}
)
message
(
STATUS
"Environment setup for Configure (SB_ENV_CONFIGURE_CMD):
${
SB_ENV_CONFIGURE_CMD
}
"
)
else
()
#windows
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment