mirror of
https://github.com/reactos/CMake.git
synced 2024-12-19 01:27:11 +00:00
25b7f87eca
Resolve conflict in Source/cmTarget.cxx by integrating the changes to the internal copy constructor from both sides. Also resolve a logical conflict by dropping the special case for INTERFACE_LIBRARY targets. Since cmTarget::SetMakefile already forces CMP0022 to NEW for such targets we need no special handling. Resolve conflict in Source/cmTargetLinkLibrariesCommand.h by dropping the documentation change. We will make the same change in the new location of the same documentation in a separate commit. Resolve conflicts in Tests/RunCMake/CMP0022/CMP0022-WARN-empty-old-stderr.txt Tests/RunCMake/CMP0022/RunCMakeTest.cmake by taking the side from the 'policy-CMP0022-fixes' branch. |
||
---|---|---|
.. | ||
dep1 | ||
dep2 | ||
dep3 | ||
CMakeLists.txt | ||
CMP0022-export-exe-stderr.txt | ||
CMP0022-export-exe.cmake | ||
CMP0022-export-result.txt | ||
CMP0022-export-stderr.txt | ||
CMP0022-export.cmake | ||
CMP0022-install-export-result.txt | ||
CMP0022-install-export-stderr.txt | ||
CMP0022-install-export.cmake | ||
CMP0022-NOWARN-exe-stderr.txt | ||
CMP0022-NOWARN-exe.cmake | ||
CMP0022-NOWARN-shared-stderr.txt | ||
CMP0022-NOWARN-shared.cmake | ||
CMP0022-NOWARN-static-link_libraries-stderr.txt | ||
CMP0022-NOWARN-static-link_libraries.cmake | ||
CMP0022-NOWARN-static-stderr.txt | ||
CMP0022-NOWARN-static.cmake | ||
CMP0022-WARN-empty-old-result.txt | ||
CMP0022-WARN-empty-old-stderr.txt | ||
CMP0022-WARN-empty-old.cmake | ||
CMP0022-WARN-static-result.txt | ||
CMP0022-WARN-static-stderr.txt | ||
CMP0022-WARN-static.cmake | ||
CMP0022-WARN-stderr.txt | ||
CMP0022-WARN-tll-result.txt | ||
CMP0022-WARN-tll-stderr.txt | ||
CMP0022-WARN-tll.cmake | ||
CMP0022-WARN.cmake | ||
empty_vs6_1.cpp | ||
empty_vs6_2.cpp | ||
empty_vs6_3.cpp | ||
empty_vs6_4.cpp | ||
empty.cpp | ||
RunCMakeTest.cmake |