Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
CMake
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
2,682
Issues
2,682
List
Boards
Labels
Milestones
Merge Requests
23
Merge Requests
23
Packages
Packages
Container Registry
External Wiki
External Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
CMake
CMake
Commits
234a069d
Commit
234a069d
authored
Jan 25, 2018
by
Brad King
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tests: Speed up RunCMake.GeneratorExpression
Avoid enabling languages in cases that do not need them.
parent
7c30a3a3
Changes
25
Hide whitespace changes
Inline
Side-by-side
Showing
25 changed files
with
30 additions
and
71 deletions
+30
-71
Tests/RunCMake/GeneratorExpression/BadTargetTypeObject-stderr.txt
...nCMake/GeneratorExpression/BadTargetTypeObject-stderr.txt
+3
-3
Tests/RunCMake/GeneratorExpression/BadTargetTypeObject.cmake
Tests/RunCMake/GeneratorExpression/BadTargetTypeObject.cmake
+1
-2
Tests/RunCMake/GeneratorExpression/CMP0044-WARN.cmake
Tests/RunCMake/GeneratorExpression/CMP0044-WARN.cmake
+1
-1
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_command-stderr.txt
...Expression/COMPILE_LANGUAGE-add_custom_command-stderr.txt
+1
-1
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_command.cmake
...ratorExpression/COMPILE_LANGUAGE-add_custom_command.cmake
+2
-6
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_target-stderr.txt
...rExpression/COMPILE_LANGUAGE-add_custom_target-stderr.txt
+1
-1
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_target.cmake
...eratorExpression/COMPILE_LANGUAGE-add_custom_target.cmake
+1
-4
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_executable-stderr.txt
...atorExpression/COMPILE_LANGUAGE-add_executable-stderr.txt
+1
-1
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_executable.cmake
...GeneratorExpression/COMPILE_LANGUAGE-add_executable.cmake
+0
-3
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_library-stderr.txt
...neratorExpression/COMPILE_LANGUAGE-add_library-stderr.txt
+1
-1
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_library.cmake
...ke/GeneratorExpression/COMPILE_LANGUAGE-add_library.cmake
+0
-3
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-target_sources-stderr.txt
...atorExpression/COMPILE_LANGUAGE-target_sources-stderr.txt
+1
-1
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-target_sources.cmake
...GeneratorExpression/COMPILE_LANGUAGE-target_sources.cmake
+1
-4
Tests/RunCMake/GeneratorExpression/NonValidTarget-CXX_COMPILER_ID-stderr.txt
...ratorExpression/NonValidTarget-CXX_COMPILER_ID-stderr.txt
+1
-1
Tests/RunCMake/GeneratorExpression/NonValidTarget-CXX_COMPILER_ID.cmake
.../GeneratorExpression/NonValidTarget-CXX_COMPILER_ID.cmake
+1
-5
Tests/RunCMake/GeneratorExpression/NonValidTarget-CXX_COMPILER_VERSION-stderr.txt
...Expression/NonValidTarget-CXX_COMPILER_VERSION-stderr.txt
+1
-1
Tests/RunCMake/GeneratorExpression/NonValidTarget-CXX_COMPILER_VERSION.cmake
...ratorExpression/NonValidTarget-CXX_COMPILER_VERSION.cmake
+1
-5
Tests/RunCMake/GeneratorExpression/NonValidTarget-C_COMPILER_ID-stderr.txt
...neratorExpression/NonValidTarget-C_COMPILER_ID-stderr.txt
+1
-1
Tests/RunCMake/GeneratorExpression/NonValidTarget-C_COMPILER_ID.cmake
...ke/GeneratorExpression/NonValidTarget-C_COMPILER_ID.cmake
+3
-7
Tests/RunCMake/GeneratorExpression/NonValidTarget-C_COMPILER_VERSION-stderr.txt
...orExpression/NonValidTarget-C_COMPILER_VERSION-stderr.txt
+1
-1
Tests/RunCMake/GeneratorExpression/NonValidTarget-C_COMPILER_VERSION.cmake
...neratorExpression/NonValidTarget-C_COMPILER_VERSION.cmake
+3
-7
Tests/RunCMake/GeneratorExpression/NonValidTarget-TARGET_POLICY-stderr.txt
...neratorExpression/NonValidTarget-TARGET_POLICY-stderr.txt
+1
-1
Tests/RunCMake/GeneratorExpression/NonValidTarget-TARGET_POLICY.cmake
...ke/GeneratorExpression/NonValidTarget-TARGET_POLICY.cmake
+1
-5
Tests/RunCMake/GeneratorExpression/NonValidTarget-TARGET_PROPERTY-stderr.txt
...ratorExpression/NonValidTarget-TARGET_PROPERTY-stderr.txt
+1
-1
Tests/RunCMake/GeneratorExpression/NonValidTarget-TARGET_PROPERTY.cmake
.../GeneratorExpression/NonValidTarget-TARGET_PROPERTY.cmake
+1
-5
No files found.
Tests/RunCMake/GeneratorExpression/BadTargetTypeObject-stderr.txt
View file @
234a069d
CMake Error at BadTargetTypeObject.cmake:
3
\(add_custom_target\):
CMake Error at BadTargetTypeObject.cmake:
2
\(add_custom_target\):
Error evaluating generator expression:
\$<TARGET_FILE:objlib>
...
...
@@ -7,7 +7,7 @@ CMake Error at BadTargetTypeObject.cmake:3 \(add_custom_target\):
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
+
CMake Error at BadTargetTypeObject.cmake:
3
\(add_custom_target\):
CMake Error at BadTargetTypeObject.cmake:
2
\(add_custom_target\):
Error evaluating generator expression:
\$<TARGET_SONAME_FILE:objlib>
...
...
@@ -16,7 +16,7 @@ CMake Error at BadTargetTypeObject.cmake:3 \(add_custom_target\):
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
+
CMake Error at BadTargetTypeObject.cmake:
3
\(add_custom_target\):
CMake Error at BadTargetTypeObject.cmake:
2
\(add_custom_target\):
Error evaluating generator expression:
\$<TARGET_LINKER_FILE:objlib>
...
...
Tests/RunCMake/GeneratorExpression/BadTargetTypeObject.cmake
View file @
234a069d
enable_language
(
C
)
add_library
(
objlib OBJECT empty.c
)
add_library
(
objlib OBJECT
)
add_custom_target
(
check ALL COMMAND echo
$<TARGET_FILE:objlib>
$<TARGET_SONAME_FILE:objlib>
...
...
Tests/RunCMake/GeneratorExpression/CMP0044-WARN.cmake
View file @
234a069d
project
(
CMP0044-WARN
)
enable_language
(
C
)
string
(
TOLOWER
${
CMAKE_C_COMPILER_ID
}
lc_test
)
if
(
lc_test STREQUAL CMAKE_C_COMPILER_ID
)
...
...
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_command-stderr.txt
View file @
234a069d
CMake Error at COMPILE_LANGUAGE-add_custom_command.cmake:
6
\(add_custom_command\):
CMake Error at COMPILE_LANGUAGE-add_custom_command.cmake:
2
\(add_custom_command\):
Error evaluating generator expression:
\$<COMPILE_LANGUAGE>
...
...
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_command.cmake
View file @
234a069d
enable_language
(
C
)
add_library
(
empty empty.c
)
add_custom_command
(
TARGET empty PRE_BUILD
add_custom_target
(
drive
)
add_custom_command
(
TARGET drive PRE_BUILD
COMMAND
${
CMAKE_COMMAND
}
-E echo $<COMPILE_LANGUAGE>
)
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_target-stderr.txt
View file @
234a069d
CMake Error at COMPILE_LANGUAGE-add_custom_target.cmake:
4
\(add_custom_target\):
CMake Error at COMPILE_LANGUAGE-add_custom_target.cmake:
1
\(add_custom_target\):
Error evaluating generator expression:
\$<COMPILE_LANGUAGE>
...
...
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_custom_target.cmake
View file @
234a069d
enable_language
(
C
)
add_custom_target
(
empty
add_custom_target
(
drive
COMMAND
${
CMAKE_COMMAND
}
-E echo $<COMPILE_LANGUAGE>
)
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_executable-stderr.txt
View file @
234a069d
CMake Error at COMPILE_LANGUAGE-add_executable.cmake:
4
\(add_executable\):
CMake Error at COMPILE_LANGUAGE-add_executable.cmake:
1
\(add_executable\):
Error evaluating generator expression:
\$<COMPILE_LANGUAGE>
...
...
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_executable.cmake
View file @
234a069d
enable_language
(
C
)
add_executable
(
empty empty.$<COMPILE_LANGUAGE>
)
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_library-stderr.txt
View file @
234a069d
CMake Error at COMPILE_LANGUAGE-add_library.cmake:
4
\(add_library\):
CMake Error at COMPILE_LANGUAGE-add_library.cmake:
1
\(add_library\):
Error evaluating generator expression:
\$<COMPILE_LANGUAGE>
...
...
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-add_library.cmake
View file @
234a069d
enable_language
(
C
)
add_library
(
empty empty.$<COMPILE_LANGUAGE>
)
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-target_sources-stderr.txt
View file @
234a069d
CMake Error at COMPILE_LANGUAGE-target_sources.cmake:
5
\(target_sources\):
CMake Error at COMPILE_LANGUAGE-target_sources.cmake:
2
\(target_sources\):
Error evaluating generator expression:
\$<COMPILE_LANGUAGE>
...
...
Tests/RunCMake/GeneratorExpression/COMPILE_LANGUAGE-target_sources.cmake
View file @
234a069d
enable_language
(
C
)
add_library
(
empty empty.c
)
add_library
(
empty
)
target_sources
(
empty PRIVATE empty.$<COMPILE_LANGUAGE>
)
Tests/RunCMake/GeneratorExpression/NonValidTarget-CXX_COMPILER_ID-stderr.txt
View file @
234a069d
CMake Error at NonValidTarget-CXX_COMPILER_ID.cmake:
4
\(add_custom_command\):
CMake Error at NonValidTarget-CXX_COMPILER_ID.cmake:
1
\(add_custom_command\):
Error evaluating generator expression:
\$<CXX_COMPILER_ID>
...
...
Tests/RunCMake/GeneratorExpression/NonValidTarget-CXX_COMPILER_ID.cmake
View file @
234a069d
enable_language
(
CXX
)
add_custom_command
(
OUTPUT
"
${
CMAKE_CURRENT_BINARY_DIR
}
/copied_file.cpp"
COMMAND
"
${
CMAKE_COMMAND
}
"
-E copy
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/empty.cpp"
"
${
CMAKE_CURRENT_BINARY_DIR
}
/copied_file$<CXX_COMPILER_ID>.cpp"
)
add_library
(
empty
"
${
CMAKE_CURRENT_BINARY_DIR
}
/copied_file.cpp"
)
add_custom_target
(
drive DEPENDS
"
${
CMAKE_CURRENT_BINARY_DIR
}
/copied_file.cpp"
)
Tests/RunCMake/GeneratorExpression/NonValidTarget-CXX_COMPILER_VERSION-stderr.txt
View file @
234a069d
CMake Error at NonValidTarget-CXX_COMPILER_VERSION.cmake:
4
\(add_custom_command\):
CMake Error at NonValidTarget-CXX_COMPILER_VERSION.cmake:
1
\(add_custom_command\):
Error evaluating generator expression:
\$<CXX_COMPILER_VERSION>
...
...
Tests/RunCMake/GeneratorExpression/NonValidTarget-CXX_COMPILER_VERSION.cmake
View file @
234a069d
enable_language
(
CXX
)
add_custom_command
(
OUTPUT
"
${
CMAKE_CURRENT_BINARY_DIR
}
/copied_file.cpp"
COMMAND
"
${
CMAKE_COMMAND
}
"
-E copy
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/empty.cpp"
"
${
CMAKE_CURRENT_BINARY_DIR
}
/copied_file$<CXX_COMPILER_VERSION>.cpp"
)
add_library
(
empty
"
${
CMAKE_CURRENT_BINARY_DIR
}
/copied_file.cpp"
)
add_custom_target
(
drive DEPENDS
"
${
CMAKE_CURRENT_BINARY_DIR
}
/copied_file.cpp"
)
Tests/RunCMake/GeneratorExpression/NonValidTarget-C_COMPILER_ID-stderr.txt
View file @
234a069d
CMake Error at NonValidTarget-C_COMPILER_ID.cmake:
4
\(add_custom_command\):
CMake Error at NonValidTarget-C_COMPILER_ID.cmake:
1
\(add_custom_command\):
Error evaluating generator expression:
\$<C_COMPILER_ID>
...
...
Tests/RunCMake/GeneratorExpression/NonValidTarget-C_COMPILER_ID.cmake
View file @
234a069d
enable_language
(
CXX
)
add_custom_command
(
OUTPUT
"
${
CMAKE_CURRENT_BINARY_DIR
}
/copied_file.cpp"
COMMAND
"
${
CMAKE_COMMAND
}
"
-E copy
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/empty.cpp"
"
${
CMAKE_CURRENT_BINARY_DIR
}
/copied_file$<C_COMPILER_ID>.cpp"
add_custom_command
(
OUTPUT
"
${
CMAKE_CURRENT_BINARY_DIR
}
/copied_file.c"
COMMAND
"
${
CMAKE_COMMAND
}
"
-E copy
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/empty.c"
"
${
CMAKE_CURRENT_BINARY_DIR
}
/copied_file$<C_COMPILER_ID>.c"
)
add_library
(
empty
"
${
CMAKE_CURRENT_BINARY_DIR
}
/copied_file.cpp"
)
add_custom_target
(
drive DEPENDS
"
${
CMAKE_CURRENT_BINARY_DIR
}
/copied_file.c"
)
Tests/RunCMake/GeneratorExpression/NonValidTarget-C_COMPILER_VERSION-stderr.txt
View file @
234a069d
CMake Error at NonValidTarget-C_COMPILER_VERSION.cmake:
4
\(add_custom_command\):
CMake Error at NonValidTarget-C_COMPILER_VERSION.cmake:
1
\(add_custom_command\):
Error evaluating generator expression:
\$<C_COMPILER_VERSION>
...
...
Tests/RunCMake/GeneratorExpression/NonValidTarget-C_COMPILER_VERSION.cmake
View file @
234a069d
enable_language
(
CXX
)
add_custom_command
(
OUTPUT
"
${
CMAKE_CURRENT_BINARY_DIR
}
/copied_file.cpp"
COMMAND
"
${
CMAKE_COMMAND
}
"
-E copy
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/empty.cpp"
"
${
CMAKE_CURRENT_BINARY_DIR
}
/copied_file$<C_COMPILER_VERSION>.cpp"
add_custom_command
(
OUTPUT
"
${
CMAKE_CURRENT_BINARY_DIR
}
/copied_file.c"
COMMAND
"
${
CMAKE_COMMAND
}
"
-E copy
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/empty.c"
"
${
CMAKE_CURRENT_BINARY_DIR
}
/copied_file$<C_COMPILER_VERSION>.c"
)
add_library
(
empty
"
${
CMAKE_CURRENT_BINARY_DIR
}
/copied_file.cpp"
)
add_custom_target
(
drive DEPENDS
"
${
CMAKE_CURRENT_BINARY_DIR
}
/copied_file.c"
)
Tests/RunCMake/GeneratorExpression/NonValidTarget-TARGET_POLICY-stderr.txt
View file @
234a069d
CMake Error at NonValidTarget-TARGET_POLICY.cmake:
4
\(add_custom_command\):
CMake Error at NonValidTarget-TARGET_POLICY.cmake:
1
\(add_custom_command\):
Error evaluating generator expression:
\$<TARGET_POLICY:CMP0004>
...
...
Tests/RunCMake/GeneratorExpression/NonValidTarget-TARGET_POLICY.cmake
View file @
234a069d
enable_language
(
CXX
)
add_custom_command
(
OUTPUT
"
${
CMAKE_CURRENT_BINARY_DIR
}
/copied_file.cpp"
COMMAND
"
${
CMAKE_COMMAND
}
"
-E copy
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/empty.cpp"
"
${
CMAKE_CURRENT_BINARY_DIR
}
/copied_file$<TARGET_POLICY:CMP0004>.cpp"
)
add_library
(
empty
"
${
CMAKE_CURRENT_BINARY_DIR
}
/copied_file.cpp"
)
add_custom_target
(
drive DEPENDS
"
${
CMAKE_CURRENT_BINARY_DIR
}
/copied_file.cpp"
)
Tests/RunCMake/GeneratorExpression/NonValidTarget-TARGET_PROPERTY-stderr.txt
View file @
234a069d
CMake Error at NonValidTarget-TARGET_PROPERTY.cmake:
4
\(add_custom_command\):
CMake Error at NonValidTarget-TARGET_PROPERTY.cmake:
1
\(add_custom_command\):
Error evaluating generator expression:
\$<TARGET_PROPERTY:NotAProperty>
...
...
Tests/RunCMake/GeneratorExpression/NonValidTarget-TARGET_PROPERTY.cmake
View file @
234a069d
enable_language
(
CXX
)
add_custom_command
(
OUTPUT
"
${
CMAKE_CURRENT_BINARY_DIR
}
/copied_file.cpp"
COMMAND
"
${
CMAKE_COMMAND
}
"
-E copy
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/empty.cpp"
"
${
CMAKE_CURRENT_BINARY_DIR
}
/copied_file$<TARGET_PROPERTY:NotAProperty>.cpp"
)
add_library
(
empty
"
${
CMAKE_CURRENT_BINARY_DIR
}
/copied_file.cpp"
)
add_custom_target
(
drive DEPENDS
"
${
CMAKE_CURRENT_BINARY_DIR
}
/copied_file.cpp"
)
Brad King
@brad.king
mentioned in commit
a24dbba3
·
Jan 26, 2018
mentioned in commit
a24dbba3
mentioned in commit a24dbba3482d5c5b8542c56047ec78dd40215a06
Toggle commit list
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