[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2573-gc533fec
Stephen Kelly
steveire at gmail.com
Mon Jun 10 10:51:24 EDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via c533fec3f75289d82f70d7f77a1ef3141baa755f (commit)
via 77ff352aa76e4b5e8b739b3098aa98b14acba8d6 (commit)
via 8a3b5bede8c8fc16b7b7b25d7e665e8936de04ee (commit)
from a97ddb475bf71f8a69ed73637c830f49e9f55303 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c533fec3f75289d82f70d7f77a1ef3141baa755f
commit c533fec3f75289d82f70d7f77a1ef3141baa755f
Merge: a97ddb4 77ff352
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jun 10 10:51:18 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 10 10:51:18 2013 -0400
Merge topic 'export-COMPILE_OPTIONS-property' into next
77ff352 Generate INTERFACE_COMPILE_OPTIONS on export.
8a3b5be Find targets in INTERFACE_COMPILE_OPTIONS when exporting for try_compile.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=77ff352aa76e4b5e8b739b3098aa98b14acba8d6
commit 77ff352aa76e4b5e8b739b3098aa98b14acba8d6
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jun 10 16:20:22 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Jun 10 16:50:20 2013 +0200
Generate INTERFACE_COMPILE_OPTIONS on export.
This was missing from commit 80ca9c4b (Add COMPILE_OPTIONS target
property., 2013-05-16).
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 39184fb..326663c 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -72,6 +72,9 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
this->PopulateInterfaceProperty("INTERFACE_COMPILE_DEFINITIONS", te,
cmGeneratorExpression::BuildInterface,
properties, missingTargets);
+ this->PopulateInterfaceProperty("INTERFACE_COMPILE_OPTIONS", te,
+ cmGeneratorExpression::BuildInterface,
+ properties, missingTargets);
this->PopulateInterfaceProperty("INTERFACE_POSITION_INDEPENDENT_CODE",
te, properties);
this->PopulateCompatibleInterfaceProperties(te, properties);
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index ea671cc..a966b16 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -130,6 +130,10 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
te,
cmGeneratorExpression::InstallInterface,
properties, missingTargets);
+ this->PopulateInterfaceProperty("INTERFACE_COMPILE_OPTIONS",
+ te,
+ cmGeneratorExpression::InstallInterface,
+ properties, missingTargets);
this->PopulateInterfaceProperty("INTERFACE_POSITION_INDEPENDENT_CODE",
te, properties);
this->PopulateCompatibleInterfaceProperties(te, properties);
diff --git a/Tests/ExportImport/Export/CMakeLists.txt b/Tests/ExportImport/Export/CMakeLists.txt
index e3f23b8..efecd03 100644
--- a/Tests/ExportImport/Export/CMakeLists.txt
+++ b/Tests/ExportImport/Export/CMakeLists.txt
@@ -162,7 +162,6 @@ set_property(TARGET testLibRequired APPEND PROPERTY
$<BUILD_INTERFACE:BuildOnly_DEFINE>
$<INSTALL_INTERFACE:InstallOnly_DEFINE>
)
-
include(GenerateExportHeader)
add_subdirectory(renamed)
@@ -201,6 +200,11 @@ set_property(TARGET testSharedLibRequired
PROPERTY
INTERFACE_CUSTOM_STRING testcontent
)
+set_property(TARGET testSharedLibRequired APPEND PROPERTY
+ INTERFACE_COMPILE_OPTIONS
+ $<$<CXX_COMPILER_ID:GNU>:-DCUSTOM_COMPILE_OPTION>
+)
+
add_library(testSharedLibDepends SHARED testSharedLibDepends.cpp)
set_property(TARGET testSharedLibDepends APPEND PROPERTY
diff --git a/Tests/ExportImport/Import/A/CMakeLists.txt b/Tests/ExportImport/Import/A/CMakeLists.txt
index 65b1a36..3bfbc46 100644
--- a/Tests/ExportImport/Import/A/CMakeLists.txt
+++ b/Tests/ExportImport/Import/A/CMakeLists.txt
@@ -169,6 +169,13 @@ target_compile_definitions(deps_shared_iface
$<$<STREQUAL:$<TARGET_PROPERTY:CUSTOM_STRING>,testcontent>:CUSTOM_STRING_IS_MATCH>
)
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+ target_compile_definitions(deps_shared_iface
+ PRIVATE
+ "DO_GNU_TESTS"
+ )
+endif()
+
if (APPLE OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
include(CheckCXXCompilerFlag)
check_cxx_compiler_flag(-fPIE run_pic_test)
@@ -199,6 +206,12 @@ endif()
add_executable(deps_shared_iface2 deps_shared_iface.cpp)
target_link_libraries(deps_shared_iface2 bld_testSharedLibDepends bld_subdirlib)
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+ target_compile_definitions(deps_shared_iface2
+ PRIVATE
+ "DO_GNU_TESTS"
+ )
+endif()
target_compile_definitions(deps_shared_iface2
PRIVATE TEST_SUBDIR_LIB
$<$<BOOL:$<TARGET_PROPERTY:POSITION_INDEPENDENT_CODE>>:PIC_PROPERTY_IS_ON>
diff --git a/Tests/ExportImport/Import/A/deps_shared_iface.cpp b/Tests/ExportImport/Import/A/deps_shared_iface.cpp
index 32e04db..d5e4de3 100644
--- a/Tests/ExportImport/Import/A/deps_shared_iface.cpp
+++ b/Tests/ExportImport/Import/A/deps_shared_iface.cpp
@@ -25,6 +25,12 @@
#include "renamed.h"
#endif
+#ifdef DO_GNU_TESTS
+#ifndef CUSTOM_COMPILE_OPTION
+#error Expected CUSTOM_COMPILE_OPTION
+#endif
+#endif
+
int main(int,char **)
{
TestSharedLibDepends dep;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8a3b5bede8c8fc16b7b7b25d7e665e8936de04ee
commit 8a3b5bede8c8fc16b7b7b25d7e665e8936de04ee
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jun 10 16:07:45 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Jun 10 16:12:22 2013 +0200
Find targets in INTERFACE_COMPILE_OPTIONS when exporting for try_compile.
This was missing from commit 80ca9c4b (Add COMPILE_OPTIONS target
property., 2013-05-16).
diff --git a/Source/cmExportTryCompileFileGenerator.cxx b/Source/cmExportTryCompileFileGenerator.cxx
index 948508b..29406dc 100644
--- a/Source/cmExportTryCompileFileGenerator.cxx
+++ b/Source/cmExportTryCompileFileGenerator.cxx
@@ -33,6 +33,7 @@ bool cmExportTryCompileFileGenerator::GenerateMainFile(std::ostream& os)
this->FindTargets("INTERFACE_INCLUDE_DIRECTORIES", te, emittedDeps);
this->FindTargets("INTERFACE_COMPILE_DEFINITIONS", te, emittedDeps);
+ this->FindTargets("INTERFACE_COMPILE_OPTIONS", te, emittedDeps);
this->PopulateProperties(te, properties, emittedDeps);
-----------------------------------------------------------------------
Summary of changes:
Source/cmExportBuildFileGenerator.cxx | 3 +++
Source/cmExportInstallFileGenerator.cxx | 4 ++++
Source/cmExportTryCompileFileGenerator.cxx | 1 +
Tests/ExportImport/Export/CMakeLists.txt | 6 +++++-
Tests/ExportImport/Import/A/CMakeLists.txt | 13 +++++++++++++
Tests/ExportImport/Import/A/deps_shared_iface.cpp | 6 ++++++
6 files changed, 32 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list