Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-15 20:46:37 +08:00
Code Issues Projects Releases Wiki Activity

ALIAS targets: Non-global aliases must be propagated to sub-directories

Browse Source 
Fixes: #20942
This commit is contained in:
Marc Chevrier
2020-07-11 16:59:50 +02:00
parent 6ab08c4e99
commit 7b0f6508a0
5 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmMakefile.cxx
View File

@@ -1461,6 +1461,9 @@ void cmMakefile::InitializeFromParent(cmMakefile* parent)
// Imported targets.
this->ImportedTargets = parent->ImportedTargets;
// Non-global Alias targets.
this->AliasTargets = parent->AliasTargets;
// Recursion depth.
this->RecursionDepth = parent->RecursionDepth;
}

7
Tests/RunCMake/alias_targets/get_property-subdir/CMakeLists.txt
View File

@@ -6,3 +6,10 @@ check_property (alias::import-local-subdir ALIASED_TARGET "import-local")
check_property (alias::import-local-subdir IMPORTED "TRUE")
check_property (alias::import-local-subdir ALIAS_GLOBAL "FALSE")
check_property (alias::import-local-subdir IMPORT_LOCAL_PROPERTY "IMPORT_LOCAL")
# non-global alias defined in parent directory must be visible in sub-directory
check_property (alias::import-local ALIASED_TARGET "import-local")
check_property (alias::import-local IMPORTED "TRUE")
check_property (alias::import-local ALIAS_GLOBAL "FALSE")
check_property (alias::import-local IMPORT_LOCAL_PROPERTY "IMPORT_LOCAL")

15
Tests/RunCMake/target_link_libraries-ALIAS/AliasTargets.cmake
View File

@@ -15,22 +15,25 @@ endif()
add_library(import-local SHARED IMPORTED)
set_property(TARGET import-local PROPERTY IMPORTED_LOCATION "${binary_dir}/${CMAKE_STATIC_LIBRARY_PREFIX}func${CMAKE_SHARED_LIBRARY_SUFFIX}")
set_property(TARGET import-local PROPERTY IMPORTED_IMPLIB "${binary_dir}/${CMAKE_STATIC_LIBRARY_PREFIX}func${CMAKE_IMPORT_LIBRARY_SUFFIX}")
add_library(alias-local ALIAS import-local)
add_library(alias::local ALIAS import-local)
add_library (lib-local SHARED lib.c)
target_link_libraries (lib-local PRIVATE import-local)
target_link_libraries (lib-local PRIVATE alias::local)
add_executable (main-local main.c)
target_link_libraries (main-local PRIVATE import-local)
target_link_libraries (main-local PRIVATE alias::local)
add_library(import-global SHARED IMPORTED GLOBAL)
set_property(TARGET import-global PROPERTY IMPORTED_LOCATION "${binary_dir}/${CMAKE_STATIC_LIBRARY_PREFIX}func${CMAKE_SHARED_LIBRARY_SUFFIX}")
set_property(TARGET import-global PROPERTY IMPORTED_IMPLIB "${binary_dir}/${CMAKE_STATIC_LIBRARY_PREFIX}func${CMAKE_IMPORT_LIBRARY_SUFFIX}")
add_library(alias-global ALIAS import-global)
add_library(alias::global ALIAS import-global)
add_library (lib-global SHARED lib.c)
target_link_libraries (lib-global PRIVATE import-global)
target_link_libraries (lib-global PRIVATE alias::global)
add_executable (main-global main.c)
target_link_libraries (main-global PRIVATE import-global)
target_link_libraries (main-global PRIVATE alias::global)
add_subdirectory(sub_dir)

2
Tests/RunCMake/target_link_libraries-ALIAS/RunCMakeTest.cmake
View File

@@ -19,5 +19,7 @@ run_cmake_target(AliasTargets lib-local lib-local --config Release)
run_cmake_target(AliasTargets main-local main-local --config Release)
run_cmake_target(AliasTargets lib-global lib-global --config Release)
run_cmake_target(AliasTargets main-global main-global --config Release)
run_cmake_target(AliasTargets lib-sub lib-sub --config Release)
run_cmake_target(AliasTargets main-sub main-sub --config Release)
unset(RunCMake_TEST_OPTIONS)
unset(RunCMake_TEST_OUTPUT_MERGE)

7
Tests/RunCMake/target_link_libraries-ALIAS/sub_dir/CMakeLists.txt Normal file
View File

@@ -0,0 +1,7 @@
add_library (lib-sub SHARED ../lib.c)
target_link_libraries (lib-sub PRIVATE alias::local)
add_executable (main-sub ../main.c)
target_link_libraries (main-sub PRIVATE alias::local)