Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
wenqing
ogs
Commits
0fa6b9f6
Commit
0fa6b9f6
authored
7 years ago
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
[CMake] Installation of .so files into install-dir/lib when using Conan.
RPath is adapted too.
parent
c4233e38
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
scripts/cmake/ConanSetup.cmake
+3
-0
3 additions, 0 deletions
scripts/cmake/ConanSetup.cmake
scripts/cmake/packaging/Pack.cmake
+7
-1
7 additions, 1 deletion
scripts/cmake/packaging/Pack.cmake
scripts/cmake/packaging/PackagingLinux.cmake
+3
-0
3 additions, 0 deletions
scripts/cmake/packaging/PackagingLinux.cmake
with
13 additions
and
1 deletion
scripts/cmake/ConanSetup.cmake
+
3
−
0
View file @
0fa6b9f6
...
...
@@ -77,6 +77,9 @@ if(MSVC)
set
(
CONAN_IMPORTS
${
CONAN_IMPORTS
}
"bin, *.dll* -> ./bin"
)
set
(
CONAN_IMPORTS
${
CONAN_IMPORTS
}
"plugins/platforms, *.dll* -> ./bin/platforms"
)
endif
()
if
(
UNIX AND NOT APPLE
)
set
(
CONAN_IMPORTS
${
CONAN_IMPORTS
}
"lib, *.so* -> ./lib"
)
endif
()
file
(
TIMESTAMP
${
PROJECT_BINARY_DIR
}
/conan_install_timestamp.txt file_timestamp
"%Y.%m.%d"
)
string
(
TIMESTAMP timestamp
"%Y.%m.%d"
)
...
...
This diff is collapsed.
Click to expand it.
scripts/cmake/packaging/Pack.cmake
+
7
−
1
View file @
0fa6b9f6
...
...
@@ -104,11 +104,17 @@ cpack_add_component(ogs_docs
if
(
OGS_USE_CONAN
)
# Install shared libraries, copied to bin-dir
foreach
(
PATTERN
"*.dll"
"*.dylib"
)
foreach
(
PATTERN
"*.dll"
"*.dylib
*
"
)
file
(
GLOB MATCHED_FILES
${
CMAKE_RUNTIME_OUTPUT_DIRECTORY
}
/
${
PATTERN
}
)
install
(
FILES
${
MATCHED_FILES
}
DESTINATION bin
)
endforeach
()
# Install shared libraries, copied to lib-dir
foreach
(
PATTERN
"*.so*"
)
file
(
GLOB MATCHED_FILES
${
CMAKE_LIBRARY_OUTPUT_DIRECTORY
}
/
${
PATTERN
}
)
install
(
FILES
${
MATCHED_FILES
}
DESTINATION lib
)
endforeach
()
# macOS frameworks are directories, exclude header files
file
(
GLOB MATCHED_DIRECTORIES
"
${
CMAKE_RUNTIME_OUTPUT_DIRECTORY
}
/*.framework"
)
install
(
DIRECTORY
${
MATCHED_DIRECTORIES
}
DESTINATION bin
...
...
This diff is collapsed.
Click to expand it.
scripts/cmake/packaging/PackagingLinux.cmake
+
3
−
0
View file @
0fa6b9f6
set
(
CPACK_GENERATOR TGZ
)
# Adds the binaries location to the LD_LIBRARY_PATH
set
(
CMAKE_INSTALL_RPATH \$ORIGIN/
)
if
(
OGS_USE_CONAN
)
SET
(
CMAKE_INSTALL_RPATH
"$ORIGIN/../lib"
)
endif
()
if
(
MODULE_CMD
)
message
(
STATUS
"Found module cmd -> writing module file."
)
...
...
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