diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-07 19:03:15 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-10-07 19:03:15 (GMT) |
| commit | 5d8da06d60138c18eb68fab01b9b6e736ecd4914 (patch) | |
| tree | 370cd99fbb702b0a7137f3387fbbeb8b68ebead0 /Source | |
| parent | a033f8671272c382ba55c23f1269439cc4db4a97 (diff) | |
| parent | dda6775c940129d2a38fecd6cf6273f7d97ccca0 (diff) | |
| download | CMake-5d8da06d60138c18eb68fab01b9b6e736ecd4914.zip CMake-5d8da06d60138c18eb68fab01b9b6e736ecd4914.tar.gz CMake-5d8da06d60138c18eb68fab01b9b6e736ecd4914.tar.bz2 | |
Merge branch 'android-export-has-cpp' into release
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmExportBuildAndroidMKGenerator.cxx | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Source/cmExportBuildAndroidMKGenerator.cxx b/Source/cmExportBuildAndroidMKGenerator.cxx index bb02311..f5e6628 100644 --- a/Source/cmExportBuildAndroidMKGenerator.cxx +++ b/Source/cmExportBuildAndroidMKGenerator.cxx @@ -9,6 +9,8 @@ #include "cmMakefile.h" #include "cmTargetExport.h" +#include <algorithm> + cmExportBuildAndroidMKGenerator::cmExportBuildAndroidMKGenerator() { this->LG = CM_NULLPTR; @@ -164,6 +166,16 @@ void cmExportBuildAndroidMKGenerator::GenerateInterfaceProperties( } } } + + // Tell the NDK build system if prebuilt static libraries use C++. + if (target->GetType() == cmState::STATIC_LIBRARY) { + cmLinkImplementation const* li = target->GetLinkImplementation(config); + if (std::find(li->Languages.begin(), li->Languages.end(), "CXX") != + li->Languages.end()) { + os << "LOCAL_HAS_CPP := true\n"; + } + } + switch (target->GetType()) { case cmState::SHARED_LIBRARY: case cmState::MODULE_LIBRARY: |