Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
VTK-m
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
phcerdan
VTK-m
Commits
dd1f0962
Commit
dd1f0962
authored
Jan 17, 2018
by
Ben Boeckel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmake: allow overriding of the build-tree CMake location
parent
74bd01b4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
6 deletions
+10
-6
CMake/VTKmConfig.cmake.in
CMake/VTKmConfig.cmake.in
+1
-1
CMakeLists.txt
CMakeLists.txt
+9
-5
No files found.
CMake/VTKmConfig.cmake.in
View file @
dd1f0962
...
...
@@ -46,7 +46,7 @@ set(VTKm_VERSION_FULL "@VTKm_VERSION_FULL@")
set(VTKm_VERSION "@VTKm_VERSION@")
# This is true when the package is still in the build directory (not installed)
if(CMAKE_CURRENT_LIST_DIR STREQUAL "@VTKm_B
INARY
_DIR@/@VTKm_INSTALL_CONFIG_DIR@")
if(CMAKE_CURRENT_LIST_DIR STREQUAL "@VTKm_B
UILD_CMAKE_BASE
_DIR@/@VTKm_INSTALL_CONFIG_DIR@")
set(VTKm_PACKAGE_IN_BUILD TRUE)
endif()
...
...
CMakeLists.txt
View file @
dd1f0962
...
...
@@ -277,9 +277,13 @@ set(VTKm_LOAD_COMPONENTS_COMMANDS "${VTKm_LOAD_COMPONENTS_COMMANDS}
endif()
endforeach()"
)
if
(
NOT DEFINED VTKm_BUILD_CMAKE_BASE_DIR
)
set
(
VTKm_BUILD_CMAKE_BASE_DIR
"
${
VTKm_BINARY_DIR
}
"
)
endif
()
configure_package_config_file
(
${
VTKm_SOURCE_DIR
}
/CMake/VTKmConfig.cmake.in
${
VTKm_B
INARY
_DIR
}
/
${
VTKm_INSTALL_CONFIG_DIR
}
/VTKmConfig.cmake
${
VTKm_B
UILD_CMAKE_BASE
_DIR
}
/
${
VTKm_INSTALL_CONFIG_DIR
}
/VTKmConfig.cmake
INSTALL_DESTINATION
${
VTKm_INSTALL_CONFIG_DIR
}
PATH_VARS
VTKm_INSTALL_INCLUDE_DIR
...
...
@@ -290,13 +294,13 @@ configure_package_config_file(
)
write_basic_package_version_file
(
${
VTKm_B
INARY
_DIR
}
/
${
VTKm_INSTALL_CONFIG_DIR
}
/VTKmConfigVersion.cmake
${
VTKm_B
UILD_CMAKE_BASE
_DIR
}
/
${
VTKm_INSTALL_CONFIG_DIR
}
/VTKmConfigVersion.cmake
VERSION
${
VTKm_VERSION
}
COMPATIBILITY ExactVersion
)
install
(
FILES
${
VTKm_B
INARY
_DIR
}
/
${
VTKm_INSTALL_CONFIG_DIR
}
/VTKmConfig.cmake
${
VTKm_B
INARY
_DIR
}
/
${
VTKm_INSTALL_CONFIG_DIR
}
/VTKmConfigVersion.cmake
${
VTKm_B
UILD_CMAKE_BASE
_DIR
}
/
${
VTKm_INSTALL_CONFIG_DIR
}
/VTKmConfig.cmake
${
VTKm_B
UILD_CMAKE_BASE
_DIR
}
/
${
VTKm_INSTALL_CONFIG_DIR
}
/VTKmConfigVersion.cmake
DESTINATION
${
VTKm_INSTALL_CONFIG_DIR
}
)
...
...
@@ -335,7 +339,7 @@ install(
# Create and install exports for external projects
export
(
EXPORT
${
VTKm_EXPORT_NAME
}
FILE
${
VTKm_B
INARY
_DIR
}
/
${
VTKm_INSTALL_CONFIG_DIR
}
/VTKmTargets.cmake
FILE
${
VTKm_B
UILD_CMAKE_BASE
_DIR
}
/
${
VTKm_INSTALL_CONFIG_DIR
}
/VTKmTargets.cmake
)
install
(
EXPORT
${
VTKm_EXPORT_NAME
}
DESTINATION
${
VTKm_INSTALL_CONFIG_DIR
}
...
...
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