Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
David Thompson
SMTK
Commits
b2d73a7c
Commit
b2d73a7c
authored
Dec 21, 2015
by
Robert Maynard
Browse files
Teach smtk to properly locate module files from cmb thirdparty build dir.
parent
f0b4c67b
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMake/SMTKConfig.cmake.in
View file @
b2d73a7c
#Setup the CMake module paths
list(APPEND CMAKE_MODULE_PATH "@SMTK_MODULE_DIR@")
set(smtk_module_dir "@SMTK_MODULE_DIR@/Modules")
list(APPEND CMAKE_MODULE_PATH "@SMTK_MODULE_DIR@
;@SMTK_VTK_MODULE_DIR@
")
set(smtk_module_dir "@SMTK_
VTK_
MODULE_DIR@/Modules")
if(IS_DIRECTORY "${smtk_module_dir}")
list(APPEND CMAKE_MODULE_PATH "${smtk_module_dir}")
file(GLOB config_files RELATIVE "${smtk_module_dir}" "${smtk_module_dir}/*.cmake")
...
...
CMakeLists.txt
View file @
b2d73a7c
...
...
@@ -470,7 +470,8 @@ export(PACKAGE SMTK)
#
# Required to happen before we include the docs directory
set
(
MOAB_ROOT_DIR
"
${
MOAB_ROOT_DIR
}
"
)
set
(
SMTK_MODULE_DIR
"
${
CMAKE_BINARY_DIR
}
/lib/cmake/SMTK"
)
set
(
SMTK_VTK_MODULE_DIR
"
${
CMAKE_BINARY_DIR
}
/lib/cmake/SMTK"
)
set
(
SMTK_MODULE_DIR
"
${
PROJECT_SOURCE_DIR
}
/CMake"
)
set
(
SMTK_CONFIG_DIR
"
${
PROJECT_BINARY_DIR
}
"
)
configure_file
(
${
PROJECT_SOURCE_DIR
}
/CMake/SMTKConfig.cmake.in
...
...
@@ -483,6 +484,7 @@ configure_file(
# Setup the config file for exports that stores what other thirdparty
# packages we need to search for ( MOAB, Remus, etc ) for when using the
# install version of smtk
set
(
SMTK_VTK_MODULE_DIR
"
\$
{CMAKE_CURRENT_LIST_DIR}"
)
set
(
SMTK_MODULE_DIR
"
\$
{CMAKE_CURRENT_LIST_DIR}"
)
set
(
SMTK_CONFIG_DIR
"
\$
{CMAKE_CURRENT_LIST_DIR}"
)
configure_file
(
...
...
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