Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
ADIOS2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue 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
Podhorszki, Norbert
ADIOS2
Commits
328802ea
Commit
328802ea
authored
7 years ago
by
Atkins, Charles Vernon
Browse files
Options
Downloads
Patches
Plain Diff
Use consistent output directories
parent
ef1a1408
No related branches found
No related tags found
1 merge request
!202
Add non cmake pacakge config
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+4
-2
4 additions, 2 deletions
CMakeLists.txt
bindings/python/CMakeLists.txt
+2
-1
2 additions, 1 deletion
bindings/python/CMakeLists.txt
with
6 additions
and
3 deletions
CMakeLists.txt
+
4
−
2
View file @
328802ea
...
...
@@ -17,8 +17,10 @@ project(ADIOS2 VERSION 2.0.0)
#------------------------------------------------------------------------------#
# Some boilerplate to setup nice output directories
#------------------------------------------------------------------------------#
include
(
GNUInstallDirs
)
set
(
CMAKE_INSTALL_CMAKEDIR
"
${
CMAKE_INSTALL_LIBDIR
}
/cmake/adios2"
)
set
(
CMAKE_INSTALL_BINDIR bin
)
set
(
CMAKE_INSTALL_LIBDIR lib
)
set
(
CMAKE_INSTALL_INCLUDEDIR include
)
set
(
CMAKE_INSTALL_CMAKEDIR lib/cmake/adios2
)
list
(
INSERT CMAKE_MODULE_PATH 0
"
${
ADIOS2_SOURCE_DIR
}
/cmake"
)
if
(
NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY
)
...
...
This diff is collapsed.
Click to expand it.
bindings/python/CMakeLists.txt
+
2
−
1
View file @
328802ea
...
...
@@ -27,7 +27,8 @@ if(ADIOS2_HAVE_MPI)
target_link_libraries
(
adios2py PRIVATE PythonModule::mpi4py
)
endif
()
string
(
REGEX REPLACE
"^
${
PYTHON_PREFIX
}
/"
""
string
(
REGEX REPLACE
"^
${
PYTHON_PREFIX
}
/[^/]*/python"
"
${
CMAKE_INSTALL_LIBDIR
}
/python"
CMAKE_INSTALL_PYTHONDIR
"
${
PYTHON_SITE_PACKAGES
}
"
)
set
(
CMAKE_INSTALL_PYTHONDIR
"
${
CMAKE_INSTALL_PYTHONDIR
}
"
...
...
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