Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
CMake
CMake
Commits
52dffb9f
Commit
52dffb9f
authored
Feb 28, 2012
by
Brad King
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'test-CMakeCommands' into find_package-improve-messages
parents
d3651041
5e1a5c44
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
7 deletions
+11
-7
Tests/CMakeCommands/CMakeLists.txt
Tests/CMakeCommands/CMakeLists.txt
+10
-0
Tests/CMakeCommands/build_command/test.cmake
Tests/CMakeCommands/build_command/test.cmake
+0
-0
Tests/CMakeLists.txt
Tests/CMakeLists.txt
+1
-7
No files found.
Tests/CMakeCommands/CMakeLists.txt
0 → 100644
View file @
52dffb9f
macro
(
add_CMakeCommands_test test
)
add_test
(
CMakeCommands.
${
test
}
${
CMAKE_CMAKE_COMMAND
}
-DCMake_SOURCE_DIR=
${
CMake_SOURCE_DIR
}
# TODO: Remove
-Ddir=
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
test
}
-Dgen=
${
CMAKE_TEST_GENERATOR
}
-P
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
test
}
/test.cmake"
)
endmacro
()
add_CMakeCommands_test
(
build_command
)
Tests/CMakeCommands/build_command/
RunCMake
.cmake
→
Tests/CMakeCommands/build_command/
test
.cmake
View file @
52dffb9f
File moved
Tests/CMakeLists.txt
View file @
52dffb9f
...
...
@@ -48,6 +48,7 @@ IF(BUILD_TESTING)
ADD_SUBDIRECTORY
(
CMakeLib
)
ADD_SUBDIRECTORY
(
CMakeOnly
)
ADD_SUBDIRECTORY
(
CMakeCommands
)
ADD_SUBDIRECTORY
(
FindPackageModeMakefileTest
)
...
...
@@ -1695,13 +1696,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
add_config_tests
(
Release
)
add_config_tests
(
RelWithDebInfo
)
add_test
(
CMakeCommands.build_command
${
CMAKE_CMAKE_COMMAND
}
-DCMake_SOURCE_DIR=
${
CMake_SOURCE_DIR
}
-Ddir=
${
CMake_BINARY_DIR
}
/Tests/CMakeCommands/build_command
-Dgen=
${
CMAKE_TEST_GENERATOR
}
-P
"
${
CMake_SOURCE_DIR
}
/Tests/CMakeCommands/build_command/RunCMake.cmake"
)
ADD_TEST_MACRO
(
CMakeCommands.target_link_libraries target_link_libraries
)
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