Lubuntu
/
cmake
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream version 3.5.2

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCgAGBQJXGmZkAAoJEP4ixv2DE11F3lUQALsIkvKPtzJ42cFp515J3Egf
 5tss0hhwHw4n52fEEMlNTffyDwvDhMNyA9o5w7UH55B3pJonDyDM17W0qJRfY8t8
 jIRmJUivxzvVDWKH42yDW897l0/bds1dQDYyEY984A2cU8nKmT+bwCmToOkGxzXL
 fOrZhZ6mlmbkL85GBo4JAMmilR/Wzv1Ffie8NlB3+CAXIORQxJsg6zm66YTPneeq
 2cydDl2S9pH2P7NPwaQYiMwbvK75PLBk3g42/z7IaDV/yI3HApZGb+Tk3YfnW6jf
 iyyKYQWCSeaCHRm9V6/25mx+TdjkKvs8HHXgpL35bb+a2gOBkkJvb5P5lbTe/IdN
 sOUf/3+JyKBDDfYy+ysneK8HsaIoEdAa3SmtoIBFvB8ybWPBfIrxqJqDyn0CT/Pa
 cujVBK0cHF3lgk+eQHeZXRVlgmc4QYwon5T6zpA36MQmfNlVHg7lBq9GG0oQSAMH
 ZjKysyi4AMv7IILOi+FiT8UjjUBolvzoyAzD7oa5fuQKgQ7fE0JaRfhmd7/1dQrE
 LwgF14qJuqKDuunzAhfNStv/WpNse6QeMalhdM3W2x3wklOUYeF6ltmSui/+YiB3
 ATty1wec9ChjQA/Eu76FVaCVFkqZZeMFTdARo/mE069dVaSLGEQ2O5J7gyen8d8x
 phIx4QdlpzagTNcwe2XI
 =0Ced
 -----END PGP SIGNATURE-----

Merge tag 'upstream/3.5.2'

Upstream version 3.5.2

# gpg: Signature made Fr 22 Apr 2016 19:59:00 CEST
# gpg:                using RSA key 0xFE22C6FD83135D45
# gpg: Good signature from "Felix Geyer <felix@fobos.de>" [ultimate]
# gpg:                 aka "Felix Geyer <debfx-pkg@fobos.de>" [ultimate]
# gpg:                 aka "Felix Geyer <debfx@kubuntu.org>" [ultimate]
# gpg:                 aka "Felix Geyer <debfx@fobos.de>" [ultimate]
# gpg:                 aka "Felix Geyer <debfx@ubuntu.com>" [ultimate]
# gpg:                 aka "Felix Geyer <felix.geyer@fobos.de>" [ultimate]
# gpg:                 aka "Felix Geyer <fgeyer@debian.org>" [ultimate]
# Primary key fingerprint: 164C 7051 2F79 2947 6764  AB56 FE22 C6FD 8313 5D45
ci/unstable
Felix Geyer 9 years ago
parent 2600f8c4ff be11404bce
commit 5fe7682f3d
20 changed files with 58 additions and 43 deletions
Show Stats Download Patch File Download Diff File

2
Modules/CMakeASM-ATTInformation.cmake
Unescape View File

@ -19,7 +19,7 @@ set(ASM_DIALECT "-ATT")
# assembler but should be processed by gcc
set(CMAKE_ASM${ASM_DIALECT}_SOURCE_FILE_EXTENSIONS s;asm)
set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "<CMAKE_ASM${ASM_DIALECT}_COMPILER> <FLAGS> -o <OBJECT> <SOURCE>")
set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "<CMAKE_ASM${ASM_DIALECT}_COMPILER> <INCLUDES> <FLAGS> -o <OBJECT> <SOURCE>")
include(CMakeASMInformation)
set(ASM_DIALECT)

2
Modules/CMakeASM_NASMInformation.cmake
Unescape View File

@ -38,7 +38,7 @@ if(NOT CMAKE_ASM_NASM_OBJECT_FORMAT)
endif()
endif()
set(CMAKE_ASM_NASM_COMPILE_OBJECT "<CMAKE_ASM_NASM_COMPILER> <FLAGS> -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o <OBJECT> <SOURCE>")
set(CMAKE_ASM_NASM_COMPILE_OBJECT "<CMAKE_ASM_NASM_COMPILER> <INCLUDES> <FLAGS> -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o <OBJECT> <SOURCE>")
# Load the generic ASMInformation file:
set(ASM_DIALECT "_NASM")

2
Modules/Compiler/ARMCC-ASM.cmake
Unescape View File

@ -3,5 +3,5 @@ include(Compiler/ARMCC)
set(CMAKE_ASM_OUTPUT_EXTENSION ".o")
set(CMAKE_ASM_OUTPUT_EXTENSION_REPLACE 1)
set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <FLAGS> -o <OBJECT> <SOURCE>")
set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <INCLUDES> <FLAGS> -o <OBJECT> <SOURCE>")
set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s;asm;msa)

2
Modules/FindGSL.cmake
Unescape View File

@ -45,7 +45,7 @@
# of GSL installation discovered. These variables may optionally be set to
# help this module find the correct files::
#
# GSL_CLBAS_LIBRARY - Location of the GSL CBLAS library.
# GSL_CBLAS_LIBRARY - Location of the GSL CBLAS library.
# GSL_CBLAS_LIBRARY_DEBUG - Location of the debug GSL CBLAS library (if any).
# GSL_CONFIG_EXECUTABLE - Location of the ``gsl-config`` script (if any).
# GSL_LIBRARY - Location of the GSL library.

4
Modules/FindXCTest.cmake
Unescape View File

@ -140,6 +140,10 @@ function(xctest_add_bundle target testee)
set_target_properties(${target} PROPERTIES
XCODE_ATTRIBUTE_BUNDLE_LOADER "$(TEST_HOST)"
XCODE_ATTRIBUTE_TEST_HOST "$<TARGET_FILE:${testee}>")
if(NOT XCODE_VERSION VERSION_LESS 7.3)
set_target_properties(${target} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY "$<TARGET_FILE_DIR:${testee}>/../PlugIns")
endif()
else(XCODE)
target_link_libraries(${target}
PRIVATE -bundle_loader $<TARGET_FILE:${testee}>)

2
Modules/Platform/Generic-ADSP-ASM.cmake
Unescape View File

@ -3,5 +3,5 @@ include(Platform/Generic-ADSP-Common)
set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS asm)
set(CMAKE_ASM_OUTPUT_EXTENSION ".doj" )
set(CMAKE_ASM_COMPILE_OBJECT
"<CMAKE_ASM_COMPILER> <FLAGS> -proc ${ADSP_PROCESSOR} -si-revision ${ADSP_PROCESSOR_SILICIUM_REVISION} -o <OBJECT> <SOURCE>")
"<CMAKE_ASM_COMPILER> <INCLUDES> <FLAGS> -proc ${ADSP_PROCESSOR} -si-revision ${ADSP_PROCESSOR_SILICIUM_REVISION} -o <OBJECT> <SOURCE>")

2
Modules/Platform/gas.cmake
Unescape View File

@ -4,7 +4,7 @@ else()
set(CMAKE_ASM${ASM_DIALECT}_OUTPUT_EXTENSION .obj)
endif()
set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "<CMAKE_ASM${ASM_DIALECT}_COMPILER> <FLAGS> -o <OBJECT> <SOURCE>")
set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "<CMAKE_ASM${ASM_DIALECT}_COMPILER> <INCLUDES> <FLAGS> -o <OBJECT> <SOURCE>")
set(CMAKE_ASM${ASM_DIALECT}_CREATE_STATIC_LIBRARY
"<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS> "

2
Source/CMakeVersion.cmake
Unescape View File

@ -1,5 +1,5 @@
# CMake version number components.
set(CMake_VERSION_MAJOR 3)
set(CMake_VERSION_MINOR 5)
set(CMake_VERSION_PATCH 1)
set(CMake_VERSION_PATCH 2)
#set(CMake_VERSION_RC 0)

2
Source/cmFLTKWrapUICommand.cxx
Unescape View File

@ -117,7 +117,7 @@ void cmFLTKWrapUICommand::FinalPass()
// people should add the srcs to the target themselves, but the old command
// didn't support that, so check and see if they added the files in and if
// they didn;t then print a warning and add then anyhow
cmTarget* target = this->Makefile->FindTarget(this->Target);
cmTarget* target = this->Makefile->FindLocalNonAliasTarget(this->Target);
if(!target)
{
std::string msg =

2
Source/cmFortranParserImpl.cxx
Unescape View File

@ -229,7 +229,7 @@ void cmFortranParser_RuleLineDirective(cmFortranParser* parser,
cmSystemTools::ConvertToUnixSlashes(included);
// Save the named file as included in the source.
if (cmSystemTools::FileExists(included))
if (cmSystemTools::FileExists(included, true))
{
parser->Info.Includes.insert(included);
}

2
Source/cmInstallCommand.cxx
Unescape View File

@ -381,7 +381,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
return false;
}
// Lookup this target in the current directory.
if(cmTarget* target=this->Makefile->FindTarget(*targetIt))
if(cmTarget* target=this->Makefile->FindLocalNonAliasTarget(*targetIt))
{
// Found the target. Check its type.
if(target->GetType() != cmState::EXECUTABLE &&

2
Source/cmInstallTargetGenerator.cxx
Unescape View File

@ -446,7 +446,7 @@ cmInstallTargetGenerator::GetInstallFilename(cmGeneratorTarget const* target,
void cmInstallTargetGenerator::Compute(cmLocalGenerator* lg)
{
this->Target = lg->FindGeneratorTarget(this->TargetName);
this->Target = lg->FindLocalNonAliasGeneratorTarget(this->TargetName);
}
//----------------------------------------------------------------------------

15
Source/cmLocalGenerator.cxx
Unescape View File

@ -485,19 +485,9 @@ private:
std::string Name;
};
cmGeneratorTarget* cmLocalGenerator::FindGeneratorTarget(
cmGeneratorTarget* cmLocalGenerator::FindLocalNonAliasGeneratorTarget(
const std::string& name) const
{
std::map<std::string, std::string>::const_iterator i =
this->AliasTargets.find(name);
if (i != this->AliasTargets.end())
{
std::vector<cmGeneratorTarget*>::const_iterator ai =
std::find_if(this->GeneratorTargets.begin(),
this->GeneratorTargets.end(),
NamedGeneratorTargetFinder(i->second));
return *ai;
}
std::vector<cmGeneratorTarget*>::const_iterator ti =
std::find_if(this->GeneratorTargets.begin(),
this->GeneratorTargets.end(),
@ -506,7 +496,6 @@ cmGeneratorTarget* cmLocalGenerator::FindGeneratorTarget(
{
return *ti;
}
return 0;
}
@ -1839,7 +1828,7 @@ cmLocalGenerator::FindGeneratorTargetToUse(const std::string& name) const
return *imported;
}
if(cmGeneratorTarget* t = this->FindGeneratorTarget(name))
if(cmGeneratorTarget* t = this->FindLocalNonAliasGeneratorTarget(name))
{
return t;
}

3
Source/cmLocalGenerator.h
Unescape View File

@ -129,7 +129,8 @@ public:
void AddImportedGeneratorTarget(cmGeneratorTarget* gt);
void AddOwnedImportedGeneratorTarget(cmGeneratorTarget* gt);
cmGeneratorTarget* FindGeneratorTarget(const std::string& name) const;
cmGeneratorTarget*
FindLocalNonAliasGeneratorTarget(const std::string& name) const;
cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
/**

4
Source/cmLocalNinjaGenerator.cxx
Unescape View File

@ -400,7 +400,7 @@ cmLocalNinjaGenerator::WriteCustomCommandBuildStatement(
bool symbolic = false;
for (std::vector<std::string>::const_iterator o = outputs.begin();
o != outputs.end(); ++o)
!symbolic && o != outputs.end(); ++o)
{
if (cmSourceFile* sf = this->Makefile->GetSource(*o))
{
@ -444,7 +444,7 @@ cmLocalNinjaGenerator::WriteCustomCommandBuildStatement(
this->ConstructComment(ccg),
"Custom command for " + ninjaOutputs[0],
cc->GetUsesTerminal(),
/*restat*/!symbolic,
/*restat*/!symbolic || !byproducts.empty(),
ninjaOutputs,
ninjaDeps,
orderOnlyDeps);

16
Source/cmMakefile.cxx
Unescape View File

@ -4058,25 +4058,13 @@ std::vector<std::string> cmMakefile::GetPropertyKeys() const
return this->StateSnapshot.GetDirectory().GetPropertyKeys();
}
cmTarget* cmMakefile::FindTarget(const std::string& name,
bool excludeAliases) const
cmTarget* cmMakefile::FindLocalNonAliasTarget(const std::string& name) const
{
if (!excludeAliases)
{
std::map<std::string, std::string>::const_iterator i =
this->AliasTargets.find(name);
if (i != this->AliasTargets.end())
{
cmTargets::iterator ai = this->Targets.find(i->second);
return &ai->second;
}
}
cmTargets::iterator i = this->Targets.find( name );
if ( i != this->Targets.end() )
{
return &i->second;
}
return 0;
}
@ -4247,7 +4235,7 @@ cmTarget* cmMakefile::FindTargetToUse(const std::string& name,
}
// Look for a target built in this directory.
if(cmTarget* t = this->FindTarget(name, excludeAliases))
if(cmTarget* t = this->FindLocalNonAliasTarget(name))
{
return t;
}

3
Source/cmMakefile.h
Unescape View File

@ -388,8 +388,7 @@ public:
}
std::vector<cmTarget*> GetImportedTargets() const;
cmTarget* FindTarget(const std::string& name,
bool excludeAliases = false) const;
cmTarget* FindLocalNonAliasTarget(const std::string& name) const;
/** Find a target to use in place of the given name. The target
returned may be imported or built within the project. */

5
Tests/AliasTarget/subdir/CMakeLists.txt
Unescape View File

@ -1,3 +1,8 @@
add_library(tgt STATIC empty.cpp)
add_library(Sub::tgt ALIAS tgt)
# foo comes from the top-level CMakeLists.txt
add_library(Top::foo ALIAS foo)
get_target_property(some_prop Top::foo SOME_PROP)
target_link_libraries(tgt Top::foo)

28
Tests/RunCMake/BuildDepends/Custom-Symbolic-and-Byproduct.cmake
Unescape View File

@ -0,0 +1,28 @@
add_custom_command(
OUTPUT gen-byproduct gen-byproduct-stamp
BYPRODUCTS byproduct
COMMAND ${CMAKE_COMMAND} -E touch gen-byproduct-stamp
COMMAND ${CMAKE_COMMAND} -E copy_if_different gen-byproduct-stamp byproduct
)
set_property(SOURCE gen-byproduct PROPERTY SYMBOLIC 1)
add_custom_target(produce DEPENDS gen-byproduct)
add_custom_command(
OUTPUT use-byproduct
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/byproduct
COMMAND ${CMAKE_COMMAND} -E touch use-byproduct
)
add_custom_target(drive ALL DEPENDS use-byproduct)
add_dependencies(drive produce)
file(GENERATE OUTPUT check-$<LOWER_CASE:$<CONFIG>>.cmake CONTENT "
if (check_step EQUAL 1)
set(check_pairs
\"${CMAKE_CURRENT_BINARY_DIR}/use-byproduct|${CMAKE_CURRENT_BINARY_DIR}/gen-byproduct-stamp\"
)
else()
set(check_pairs
\"${CMAKE_CURRENT_BINARY_DIR}/gen-byproduct-stamp|${CMAKE_CURRENT_BINARY_DIR}/use-byproduct\"
)
endif()
")

1
Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
Unescape View File

@ -39,4 +39,5 @@ if(NOT RunCMake_GENERATOR MATCHES "Visual Studio [67]|Xcode")
unset(run_BuildDepends_skip_step_2)
endif()
run_BuildDepends(Custom-Symbolic-and-Byproduct)
run_BuildDepends(Custom-Always)

Write Preview
Loading…
Cancel
Save