diff options
| author | Brad King <brad.king@kitware.com> | 2024-08-28 18:00:50 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-08-28 18:12:54 (GMT) |
| commit | 810e33f67a759e56b37b12ca96d5647ba517c431 (patch) | |
| tree | 9393c6b0168bf80cd8d91d67643143e88d0563b6 /Tests/VSExternalInclude | |
| parent | 1ad39a9cf8cf2e40c3d9e2fa2b2f807d1d81fceb (diff) | |
| download | CMake-810e33f67a759e56b37b12ca96d5647ba517c431.zip CMake-810e33f67a759e56b37b12ca96d5647ba517c431.tar.gz CMake-810e33f67a759e56b37b12ca96d5647ba517c431.tar.bz2 | |
Tests: Simplify tests for Visual Studio generators
Since commit 03c31b0395 (Drop Visual Studio 9 2008 generator,
2024-05-06, v3.30.0-rc1~134^2), some tests do not need to be
version-dependent.
Diffstat (limited to 'Tests/VSExternalInclude')
| -rw-r--r-- | Tests/VSExternalInclude/CMakeLists.txt | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/Tests/VSExternalInclude/CMakeLists.txt b/Tests/VSExternalInclude/CMakeLists.txt index a44988e..ce5d57b 100644 --- a/Tests/VSExternalInclude/CMakeLists.txt +++ b/Tests/VSExternalInclude/CMakeLists.txt @@ -1,12 +1,6 @@ cmake_minimum_required (VERSION 3.5) project(VSExternalInclude) -if(${CMAKE_GENERATOR} MATCHES "Visual Studio 1[0124567]") - set(PROJECT_EXT vcxproj) -else() - set(PROJECT_EXT vcproj) -endif() - # make sure directories exists set(LIB1_BINARY_DIR ${VSExternalInclude_BINARY_DIR}/Lib1) make_directory("${LIB1_BINARY_DIR}") @@ -37,9 +31,9 @@ execute_process( message("CMAKE Ran with the following output:\n\"${OUT}\"") -include_external_msproject(lib1 ${VSExternalInclude_BINARY_DIR}/Lib1/LIB1.${PROJECT_EXT}) +include_external_msproject(lib1 ${VSExternalInclude_BINARY_DIR}/Lib1/LIB1.vcxproj) # lib2 depends on lib1 -include_external_msproject(lib2 ${VSExternalInclude_BINARY_DIR}/Lib2/LIB2.${PROJECT_EXT} lib1) +include_external_msproject(lib2 ${VSExternalInclude_BINARY_DIR}/Lib2/LIB2.vcxproj lib1) include_directories(${VSExternalInclude_SOURCE_DIR}/Lib2 ${VSExternalInclude_SOURCE_DIR}/Lib1) @@ -55,9 +49,7 @@ add_dependencies(VSExternalInclude lib2) # and the sln file can no longer be the only source # of that depend. So, for VS 10 make the executable # depend on lib1 and lib2 -if(${CMAKE_GENERATOR} MATCHES "Visual Studio 1[0124567]") - add_dependencies(VSExternalInclude lib1) -endif() +add_dependencies(VSExternalInclude lib1) # Interaction testing between the FOLDER target property and # INCLUDE_EXTERNAL_MSPROJECT targets: |