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
Dave Pugmire
VTK-m
Commits
bbb39122
Commit
bbb39122
authored
Jun 24, 2019
by
Robert Maynard
Browse files
VTKmTestInstall properly propagates compiler flags
parent
86df1d27
Changes
1
Hide whitespace changes
Inline
Side-by-side
CMake/testing/VTKmTestInstall.cmake
View file @
bbb39122
...
...
@@ -62,11 +62,12 @@ file(GENERATE
OUTPUT
"
${${
file_loc_var
}}
"
CONTENT
"
set(CMAKE_PREFIX_PATH
\"
${
install_prefix
}
/
\"
CACHE STRING
\"\"
)
set(CMAKE_MAKE_PROGRAM
\"
${
CMAKE_MAKE_PROGRAM
}
\"
CACHE FILEPATH
\"\"
)
set(CMAKE_PREFIX_PATH
\"
${
CMAKE_PREFIX_PATH
}
;
${
install_prefix
}
/
\"
CACHE STRING
\"\"
)
set(CMAKE_CXX_COMPILER
\"
${
CMAKE_CXX_COMPILER
}
\"
CACHE FILEPATH
\"\"
)
set(CMAKE_CXX_FLAGS
\"
${
CMAKE_CXX_FLAGS
}
\"
CACHE STRING
\"\"
)
set(CMAKE_CXX_FLAGS
\"
$
CACHE
{CMAKE_CXX_FLAGS}
\"
CACHE STRING
\"\"
)
set(CMAKE_CUDA_COMPILER
\"
${
CMAKE_CUDA_COMPILER
}
\"
CACHE FILEPATH
\"\"
)
set(CMAKE_CUDA_FLAGS
\"
${
CMAKE_CUDA_FLAGS
}
\"
CACHE STRING
\"\"
)
set(CMAKE_CUDA_FLAGS
\"
$
CACHE
{CMAKE_CUDA_FLAGS}
\"
CACHE STRING
\"\"
)
set(CMAKE_CUDA_HOST_COMPILER
\"
${
CMAKE_CUDA_HOST_COMPILER
}
\"
CACHE FILEPATH
\"\"
)
"
)
...
...
@@ -80,8 +81,34 @@ function(vtkm_test_against_install dir)
set
(
src_dir
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
name
}
/"
)
set
(
build_dir
"
${
VTKm_BINARY_DIR
}
/CMakeFiles/_tmp_build/test_
${
name
}
/"
)
set
(
build_config
"
${
build_dir
}
/build_options.cmake"
)
vtkm_generate_install_build_options
(
build_config
)
set
(
args
)
if
(
CMAKE_VERSION VERSION_LESS 3.13
)
#Before 3.13 the config file passing to cmake via ctest --build-options
#was broken
set
(
args
-DCMAKE_MAKE_PROGRAM:FILEPATH=
${
CMAKE_MAKE_PROGRAM
}
-DCMAKE_PREFIX_PATH:STRING=
${
install_prefix
}
-DCMAKE_CXX_COMPILER:FILEPATH=
${
CMAKE_CXX_COMPILER
}
-DCMAKE_CUDA_COMPILER:FILEPATH=
${
CMAKE_CUDA_COMPILER
}
-DCMAKE_CUDA_HOST_COMPILER:FILEPATH=
${
CMAKE_CUDA_HOST_COMPILER
}
-DCMAKE_CXX_FLAGS:STRING=$CACHE{CMAKE_CXX_FLAGS}
-DCMAKE_CUDA_FLAGS:STRING=$CACHE{CMAKE_CUDA_FLAGS}
)
else
()
set
(
build_config
"
${
build_dir
}
build_options.cmake"
)
vtkm_generate_install_build_options
(
build_config
)
set
(
args -C
${
build_config
}
)
endif
()
if
(
WIN32 AND TARGET vtkm::tbb
)
#on windows we need to specify these as FindTBB won't
#find the installed version just with the prefix path
list
(
APPEND args
-DTBB_LIBRARY_DEBUG:FILEPATH=
${
TBB_LIBRARY_DEBUG
}
-DTBB_LIBRARY_RELEASE:FILEPATH=
${
TBB_LIBRARY_RELEASE
}
-DTBB_INCLUDE_DIR:PATH=
${
TBB_INCLUDE_DIR
}
)
endif
()
#determine if the test is expected to compile or fail to build. We use
#this information to built the test name to make it clear to the user
...
...
@@ -96,7 +123,9 @@ function(vtkm_test_against_install dir)
--build-and-test
${
src_dir
}
${
build_dir
}
--build-generator
${
CMAKE_GENERATOR
}
--build-makeprogram
${
CMAKE_MAKE_PROGRAM
}
--build-options
"-C"
"
${
build_config
}
"
--build-options
${
args
}
--no-warn-unused-cli
)
set_tests_properties
(
${
build_name
}
PROPERTIES LABELS
${
test_label
}
)
...
...
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