Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
dynamic
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
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
MostafaMollaali
dynamic
Commits
00129fc9
Commit
00129fc9
authored
6 years ago
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
[CMake] Fix Python install on Windows.
parent
cfbe594c
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+3
-4
3 additions, 4 deletions
CMakeLists.txt
scripts/cmake/packaging/Pack.cmake
+8
-1
8 additions, 1 deletion
scripts/cmake/packaging/Pack.cmake
with
11 additions
and
5 deletions
CMakeLists.txt
+
3
−
4
View file @
00129fc9
...
...
@@ -214,10 +214,6 @@ option(OGS_COVERAGE "Enables code coverage measurements with gcov/lcov." OFF)
option
(
OGS_SYNC_SUBMODULES
"Sync git submodules on CMake run. Overwrites custom URLs!"
ON
)
# Packaging
option
(
OGS_DOWNLOAD_ADDITIONAL_CONTENT
"Should additional content such as manuals be downloaded and packaged?"
OFF
)
include
(
scripts/cmake/packaging/Pack.cmake
)
# Third-party libraries, names come from Conan package names
set
(
OGS_LIBS VTK Boost Eigen3 Qt Shapelib libgeotiff CACHE INTERNAL
""
)
foreach
(
LIB
${
OGS_LIBS
}
)
...
...
@@ -303,6 +299,9 @@ endif()
# Logging level
add_definitions
(
-DLOGOG_LEVEL=
${
OGS_LOG_LEVEL
}
)
# Packaging
option
(
OGS_DOWNLOAD_ADDITIONAL_CONTENT
"Should additional content such as manuals be downloaded and packaged?"
OFF
)
include
(
scripts/cmake/packaging/Pack.cmake
)
######################
### Subdirectories ###
...
...
This diff is collapsed.
Click to expand it.
scripts/cmake/packaging/Pack.cmake
+
8
−
1
View file @
00129fc9
...
...
@@ -123,9 +123,16 @@ if(OGS_USE_CONAN)
endif
()
if
(
OGS_USE_PYTHON
)
install
(
FILES
${
Python_LIBRARIES
}
DESTINATION
${
CMAKE_RUNTIME_OUTPUT_DIRECTORY
}
)
if
(
WIN32
)
file
(
GLOB PYTHON_RUNTIME_LIBS
"
${
Python_RUNTIME_LIBRARY_DIRS
}
/*.dll"
)
message
(
STATUS
"Install Python:
${
PYTHON_RUNTIME_LIBS
}
"
)
install
(
FILES
${
PYTHON_RUNTIME_LIBS
}
DESTINATION bin
)
else
()
install
(
FILES
${
Python_LIBRARIES
}
DESTINATION bin
)
endif
()
endif
()
configure_file
(
Documentation/README.txt.in
${
PROJECT_BINARY_DIR
}
/README.txt
)
install
(
FILES
${
PROJECT_BINARY_DIR
}
/README.txt DESTINATION .
)
...
...
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