[Cmake-commits] CMake branch, master, updated. v3.0.2-1962-g83e0ceb
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, master has been updated via 83e0ceb285311836cc8a403a57774ce5d3caead8 (commit) from f640b2a41f9c421f4e29fefaaa6e317d6cd962e0 (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=83e0ceb285311836cc8a403a57774ce5d3caead8 commit 83e0ceb285311836cc8a403a57774ce5d3caead8 Author: Kitware Robot AuthorDate: Wed Oct 1 00:01:10 2014 -0400 Commit: Kitware Robot CommitDate: Wed Oct 1 00:01:10 2014 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index c5303ce..0f98755 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 0) -set(CMake_VERSION_PATCH 20140930) +set(CMake_VERSION_PATCH 20141001) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.2-5550-g3777600
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 3777600058bfa2aac8847fc997114c5c1eb2f23f (commit)
via 9119ab6e4a8b10c053b2a0125ea4c5edf4ec0716 (commit)
via 55707fd53143d8f4899d37284e974de5c0f06df1 (commit)
via c4640a1e2ba2eb57207509ea9f72237ce06e275f (commit)
via f8e4d2cb5600958ff07f8f409c7851b33f752ab5 (commit)
via 26f7427fbed6b520923fbe7af856eb4d062fc29c (commit)
from 6c193709bf1f58d51bed11829a99bbba258e3fc1 (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=3777600058bfa2aac8847fc997114c5c1eb2f23f
commit 3777600058bfa2aac8847fc997114c5c1eb2f23f
Merge: 6c19370 9119ab6
Author: Adam Strzelecki
AuthorDate: Tue Sep 30 13:43:14 2014 -0400
Commit: CMake Topic Stage
CommitDate: Tue Sep 30 13:43:14 2014 -0400
Merge topic 'fix-OSX-bundle-rpaths-and-Qt5' into next
9119ab6e Make sure we bundle Qt5 Cocoa platform plugin
55707fd5 Framework codesign Resources/Info.plist & Current
c4640a1e Resolve & replace @rpath placeholders
f8e4d2cb Make sure dyld placeholders are prefixes
26f7427f Use find on UNIX for fast executable lookup
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9119ab6e4a8b10c053b2a0125ea4c5edf4ec0716
commit 9119ab6e4a8b10c053b2a0125ea4c5edf4ec0716
Author: Adam Strzelecki
AuthorDate: Thu Sep 4 14:50:59 2014 +0200
Commit: Adam Strzelecki
CommitDate: Tue Sep 30 19:41:48 2014 +0200
Make sure we bundle Qt5 Cocoa platform plugin
Otherwise CMake.app bundle will not run when using Qt5.
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 8da88c1..03c2fb4 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -35,6 +35,32 @@ if (Qt5Widgets_FOUND)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+ # We need to install Cocoa platform plugin and add qt.conf for Qt5 on Mac.
+ # FIXME: This should be part of Qt5 CMake scripts, but unfortunatelly
+ # Qt5 Mac support is missing there.
+ if(APPLE)
+macro(install_qt5_plugin _qt_plugin_name _qt_plugins_var)
+ get_target_property(_qt_plugin_path "${_qt_plugin_name}" LOCATION)
+ if(EXISTS "${_qt_plugin_path}")
+get_filename_component(_qt_plugin_file "${_qt_plugin_path}" NAME)
+get_filename_component(_qt_plugin_type "${_qt_plugin_path}" PATH)
+get_filename_component(_qt_plugin_type "${_qt_plugin_type}" NAME)
+set(_qt_plugin_dest
"${CMAKE_INSTALL_PREFIX}/PlugIns/${_qt_plugin_type}")
+install(FILES "${_qt_plugin_path}"
+ DESTINATION "${_qt_plugin_dest}")
+set(${_qt_plugins_var}
+ "${${_qt_plugins_var}};${_qt_plugin_dest}/${_qt_plugin_file}")
+ else()
+message(FATAL_ERROR "QT plugin ${_qt_plugin_name} not found")
+ endif()
+endmacro()
+install_qt5_plugin("Qt5::QCocoaIntegrationPlugin" QT_PLUGINS)
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
+ "[Paths]\nPlugins = PlugIns\n")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
+ DESTINATION "${CMAKE_INSTALL_PREFIX}/Resources")
+ endif()
+
if(WIN32 AND TARGET Qt5::Core)
get_property(_Qt5_Core_LOCATION TARGET Qt5::Core PROPERTY LOCATION)
get_filename_component(Qt_BIN_DIR "${_Qt5_Core_LOCATION}" PATH)
@@ -168,7 +194,7 @@ if(APPLE OR WIN32)
install(CODE "
include(\"${CMake_SOURCE_DIR}/Modules/BundleUtilities.cmake\")
set(BU_CHMOD_BUNDLE_ITEMS ON)
-fixup_bundle(\"${fixup_exe}\" \"\" \"${QT_LIBRARY_DIR};${QT_BINARY_DIR}\")
+fixup_bundle(\"${fixup_exe}\" \"${QT_PLUGINS}\"
\"${QT_LIBRARY_DIR};${QT_BINARY_DIR}\")
")
endif()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55707fd53143d8f4899d37284e974de5c0f06df1
commit 55707fd53143d8f4899d37284e974de5c0f06df1
Author: Adam Strzelecki
AuthorDate: Thu Sep 4 15:01:17 2014 +0200
Commit: Adam Strzelecki
CommitDate: Tue Sep 30 19:41:47 2014 +0200
Framework codesign Resources/Info.plist & Current
We need to ensure copied framework has proper layout with
Resources/Info.plist
present next to versioned binary and Current symlink in Versions:
https://developer.apple.com/library/mac/technotes/tn2206
https://developer.apple.com/library/mac/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/FrameworkAnatomy.html
If Resources/ is not present we may try to copy Contents/Info.plist if
present
to embedded Resources/Info.plist. This is a case of Qt5 that has
obsolete/invalid framework layout (see QTBUG-38511).
diff --git a/Modules/BundleUtilities.cmake b/Mo
[Cmake-commits] CMake branch, master, updated. v3.0.2-1957-g40ae354
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, master has been updated via 40ae354ebb1e7ba8a1fdb1ac28627fb94424bf99 (commit) via 33f031295c2bb8d652e4d5f8749e50ef24d7adb6 (commit) from 34d035e70e3ef3f79212bd8c5b5d36250090d856 (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=40ae354ebb1e7ba8a1fdb1ac28627fb94424bf99 commit 40ae354ebb1e7ba8a1fdb1ac28627fb94424bf99 Merge: 34d035e 33f0312 Author: Brad King AuthorDate: Tue Sep 30 11:29:04 2014 -0400 Commit: CMake Topic Stage CommitDate: Tue Sep 30 11:29:04 2014 -0400 Merge topic 'GNUInstallDirs-typo' 33f03129 Fix typo in Modules/GNUInstallDirs.cmake (#15176) --- Summary of changes: Modules/GNUInstallDirs.cmake |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.2-5544-g6c19370
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 6c193709bf1f58d51bed11829a99bbba258e3fc1 (commit) via f640b2a41f9c421f4e29fefaaa6e317d6cd962e0 (commit) via 0799b3d8db7920f99ccaf25b4edbf59b8b829678 (commit) via 40ae354ebb1e7ba8a1fdb1ac28627fb94424bf99 (commit) from 1f118092385cb3d36cf777f30116061b12353e19 (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=6c193709bf1f58d51bed11829a99bbba258e3fc1 commit 6c193709bf1f58d51bed11829a99bbba258e3fc1 Merge: 1f11809 f640b2a Author: Brad King AuthorDate: Tue Sep 30 11:29:16 2014 -0400 Commit: Brad King CommitDate: Tue Sep 30 11:29:16 2014 -0400 Merge branch 'master' into next --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.2-1959-g0799b3d
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, master has been updated via 0799b3d8db7920f99ccaf25b4edbf59b8b829678 (commit) via 3da328d38fda55f1683c4e033f17366493305349 (commit) from 40ae354ebb1e7ba8a1fdb1ac28627fb94424bf99 (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=0799b3d8db7920f99ccaf25b4edbf59b8b829678 commit 0799b3d8db7920f99ccaf25b4edbf59b8b829678 Merge: 40ae354 3da328d Author: Brad King AuthorDate: Tue Sep 30 11:29:06 2014 -0400 Commit: CMake Topic Stage CommitDate: Tue Sep 30 11:29:06 2014 -0400 Merge topic 'build_cmake_dmg_non_universal' 3da328d3 Make the OSX 10.6+ release x86_64 only. --- Summary of changes: Utilities/Release/dashmacmini5_release.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.2-1961-gf640b2a
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, master has been updated via f640b2a41f9c421f4e29fefaaa6e317d6cd962e0 (commit) via 69fe5920b359398f9618f93e47d199ce889edc23 (commit) from 0799b3d8db7920f99ccaf25b4edbf59b8b829678 (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=f640b2a41f9c421f4e29fefaaa6e317d6cd962e0 commit f640b2a41f9c421f4e29fefaaa6e317d6cd962e0 Merge: 0799b3d 69fe592 Author: Brad King AuthorDate: Tue Sep 30 11:29:09 2014 -0400 Commit: CMake Topic Stage CommitDate: Tue Sep 30 11:29:09 2014 -0400 Merge topic 'cleanup-CMP0054' 69fe5920 GenerateExportHeader: Avoid if() quoted auto-dereference --- Summary of changes: Modules/GenerateExportHeader.cmake | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.2-5540-g1f11809
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 1f118092385cb3d36cf777f30116061b12353e19 (commit)
via ee7f5624a387c38d791b0449fc679a4b1fc583c5 (commit)
from c327efc5ead147a518621a4ae20e1456f36c6400 (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=1f118092385cb3d36cf777f30116061b12353e19
commit 1f118092385cb3d36cf777f30116061b12353e19
Merge: c327efc ee7f562
Author: Stephen Kelly
AuthorDate: Tue Sep 30 09:46:40 2014 -0400
Commit: CMake Topic Stage
CommitDate: Tue Sep 30 09:46:40 2014 -0400
Merge topic 'autorcc-depends' into next
ee7f5624 QtAutogen: Regenerate qrc files if their input changes (#15074)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ee7f5624a387c38d791b0449fc679a4b1fc583c5
commit ee7f5624a387c38d791b0449fc679a4b1fc583c5
Author: Stephen Kelly
AuthorDate: Wed Sep 17 02:42:30 2014 +0200
Commit: Stephen Kelly
CommitDate: Tue Sep 30 15:46:05 2014 +0200
QtAutogen: Regenerate qrc files if their input changes (#15074)
Get dependencies from the output of ``rcc --list`` if using
Qt 5. Otherwise process the file in the same way as the
qt4_add_resources macro.
This does not work with the Ninja generator, and it does not
work for RCC files which are generated.
diff --git a/Modules/AutogenInfo.cmake.in b/Modules/AutogenInfo.cmake.in
index 602b065..7d89420 100644
--- a/Modules/AutogenInfo.cmake.in
+++ b/Modules/AutogenInfo.cmake.in
@@ -1,5 +1,6 @@
set(AM_SOURCES @_cpp_files@ )
set(AM_RCC_SOURCES @_rcc_files@ )
+set(AM_RCC_INPUTS @_qt_rcc_inputs@)
set(AM_SKIP_MOC @_skip_moc@ )
set(AM_SKIP_UIC @_skip_uic@ )
set(AM_HEADERS @_moc_headers@ )
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 4e40fc7..8054527 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -166,6 +166,112 @@ static std::string getAutogenTargetDir(cmTarget const*
target)
return targetDir;
}
+std::string cmQtAutoGenerators::ListQt5RccInputs(cmSourceFile* sf,
+cmTarget* target,
+std::vector& depends)
+{
+ std::string rccCommand = this->GetRccExecutable(target);
+ std::vector qrcEntries;
+
+ std::vector command;
+ command.push_back(rccCommand);
+ command.push_back("--list");
+
+ std::string absFile = cmsys::SystemTools::GetRealPath(
+ sf->GetFullPath().c_str());
+
+ command.push_back(absFile);
+
+ std::string output;
+ int retVal = 0;
+ bool result = cmSystemTools::RunSingleCommand(command, &output,
+&retVal, 0,
+cmSystemTools::OUTPUT_NONE);
+ if (!result || retVal)
+{
+std::cerr << "AUTOGEN: error: Rcc list process for " << sf->GetFullPath()
+ << " failed:\n" << output << std::endl;
+return std::string();
+}
+
+ std::istringstream ostr(output);
+ std::string oline;
+ while(std::getline(ostr, oline))
+{
+if (oline.empty())
+ {
+ // The output of rcc --list contains many empty lines.
+ continue;
+ }
+if (cmHasLiteralPrefix(oline, "RCC: Error in"))
+ {
+ static std::string searchString = "Cannot find file '";
+
+ std::string::size_type pos = oline.find(searchString);
+ if (pos == std::string::npos)
+{
+std::cerr << "AUTOGEN: error: Rcc lists unparsable output "
+ << oline << std::endl;
+return std::string();
+}
+ pos += searchString.length();
+ std::string::size_type sz = oline.size() - pos - 1;
+ qrcEntries.push_back(oline.substr(pos, sz));
+ }
+else
+ {
+ qrcEntries.push_back(oline);
+ }
+}
+ depends.insert(depends.end(), qrcEntries.begin(), qrcEntries.end());
+ std::string entriesList;
+ const char* sep = "";
+ for(std::vector::const_iterator it = qrcEntries.begin();
+ it != qrcEntries.end(); ++it)
+{
+entriesList += sep;
+entriesList += *it;
+sep = "@list_sep@";
+}
+ return entriesList;
+}
+
+std::string cmQtAutoGenerators::ListQt4RccInputs(cmSourceFile* sf,
+std::vector& depends)
+{
+ const std::string qrcContents = ReadAll(sf->GetFullPath());
+
+ cmsys::RegularExpression fileMatchRegex("(]*>)");
+fileReplaceRegex.find(qrcEntry);
+std::string tag = fileReplaceRegex.match(1);
+
+qrcEntry = qrcEntry.substr(tag.size());
+
+if (!cmSystemTools::FileIsFullPath(qrcEntry.c_str()))
+ {
+ qrcEntry
[Cmake-commits] CMake branch, next, updated. v3.0.2-5538-gc327efc
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 c327efc5ead147a518621a4ae20e1456f36c6400 (commit) via 34d035e70e3ef3f79212bd8c5b5d36250090d856 (commit) via 026c4a5d1b3ac3297b7a205d779cfcff6f74a67a (commit) from 78ada1ffa5a64f0cac937907e851c8b6636da99e (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=c327efc5ead147a518621a4ae20e1456f36c6400 commit c327efc5ead147a518621a4ae20e1456f36c6400 Merge: 78ada1f 34d035e Author: Brad King AuthorDate: Tue Sep 30 08:46:45 2014 -0400 Commit: Brad King CommitDate: Tue Sep 30 08:46:45 2014 -0400 Merge branch 'master' into next --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.2-1955-g34d035e
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, master has been updated
via 34d035e70e3ef3f79212bd8c5b5d36250090d856 (commit)
via df84281d68a715658ce0068c0869dd80831cd4a7 (commit)
via 69e198dc3fd0e0d16a7b4fe5bcda4c6e1e77ea2f (commit)
via 5365c9ac377ab6f579a1af32c4bfbec798417efb (commit)
via 178f56a57996651a4f8c2a20271f1e2c999279d2 (commit)
via 7115702f1b116fcf9b82ab197bab7426db10c610 (commit)
via a62894998f59d87e092a664ea50e33ff8dbb180c (commit)
via c12e46991e02c2ea59864512d2c1fb7c2b4b0f9d (commit)
via 9a4df52aa1f6736c2eceebd109240441bc3a4d6e (commit)
via 16569abfa83ce231b1270282f03aae0b4542c42d (commit)
via ef0fd4f0ced850edd049bb05b527c3bd234f441f (commit)
via d09b60f563902bd2197d88a3e83b119c09e62428 (commit)
via 2f071466ebd4e3a416a523ac5f17c84543ff8b3c (commit)
from 026c4a5d1b3ac3297b7a205d779cfcff6f74a67a (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=34d035e70e3ef3f79212bd8c5b5d36250090d856
commit 34d035e70e3ef3f79212bd8c5b5d36250090d856
Merge: 026c4a5 df84281
Author: Brad King
AuthorDate: Tue Sep 30 08:46:27 2014 -0400
Commit: CMake Topic Stage
CommitDate: Tue Sep 30 08:46:27 2014 -0400
Merge topic 'vs-nsight-tegra-generator'
df84281d Help: Add notes for topic 'vs-nsight-tegra-generator'
69e198dc VS: Generate Nsight Tegra project revision number
5365c9ac VS: Map Nsight Tegra file types in .vcxproj files
178f56a5 VS: Fix Tegra-Android platform linking of libraries by name
7115702f Tests: Add test for VS Nsight Tegra generator support
a6289499 VS: Generate ANDROID_GUI executables as app packages
c12e4699 Add 'ANDROID_API' target property to set Android Target API
9a4df52a Add 'ANDROID_GUI' target property to mark Android applications
16569abf cmTarget: Track internally whether platform is Android
ef0fd4f0 VS: Teach vcxproj generation about the Tegra-Android platform
d09b60f5 VS: Detect compiler id of Nsight Tegra-Android toolchains
2f071466 VS: Teach VS >= 10 to recognize CMAKE_SYSTEM_NAME 'Android'
---
Summary of changes:
Help/manual/cmake-properties.7.rst |2 +
Help/manual/cmake-variables.7.rst |3 +
Help/prop_tgt/ANDROID_API.rst |7 +
Help/prop_tgt/ANDROID_GUI.rst |9 ++
Help/release/dev/vs-nsight-tegra-generator.rst |8 +
Help/variable/CMAKE_ANDROID_API.rst|5 +
Help/variable/CMAKE_ANDROID_GUI.rst|5 +
Help/variable/CMAKE_VS_NsightTegra_VERSION.rst |7 +
Modules/CMakeDetermineCompilerId.cmake | 22 ++-
Modules/CMakeFindBinUtils.cmake|3 +-
...{VS-10.vcxproj.in => VS-NsightTegra.vcxproj.in} | 37 ++---
Modules/Platform/Android.cmake |6 +
Source/cmGlobalVisualStudio10Generator.cxx | 47 ++
Source/cmGlobalVisualStudio10Generator.h |7 +
Source/cmTarget.cxx| 23 ++-
Source/cmTarget.h |1 +
Source/cmVisualStudio10TargetGenerator.cxx | 155 +++-
Source/cmVisualStudio10TargetGenerator.h |4 +
Tests/CMakeLists.txt | 28 +++-
Tests/VSNsightTegra/AndroidManifest.xml| 16 ++
Tests/VSNsightTegra/CMakeLists.txt | 39 +
Tests/VSNsightTegra/build.xml |4 +
Tests/VSNsightTegra/jni/first.c| 22 +++
Tests/VSNsightTegra/jni/first.h| 22 +++
Tests/VSNsightTegra/jni/second.c | 27
Tests/VSNsightTegra/res/values/strings.xml |4 +
.../src/com/example/twolibs/TwoLibs.java | 46 ++
27 files changed, 530 insertions(+), 29 deletions(-)
create mode 100644 Help/prop_tgt/ANDROID_API.rst
create mode 100644 Help/prop_tgt/ANDROID_GUI.rst
create mode 100644 Help/release/dev/vs-nsight-tegra-generator.rst
create mode 100644 Help/variable/CMAKE_ANDROID_API.rst
create mode 100644 Help/variable/CMAKE_ANDROID_GUI.rst
create mode 100644 Help/variable/CMAKE_VS_NsightTegra_VERSION.rst
copy Modules/CompilerId/{VS-10.vcxproj.in => VS-NsightTegra.vcxproj.in} (67%)
create mode 100644 Tests/VSNsightTegra/AndroidManifest.xml
create mode 100644 Tests/VSNsightTegra/CMakeLists.txt
create mode 100644 Tests/VSNsightTegra/build.xml
create mode 100644 Tests/VSNsightTegra/jni/first.c
create mode 100644
[Cmake-commits] CMake branch, next, updated. v3.0.2-5535-g78ada1f
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 78ada1ffa5a64f0cac937907e851c8b6636da99e (commit)
via df84281d68a715658ce0068c0869dd80831cd4a7 (commit)
via 69e198dc3fd0e0d16a7b4fe5bcda4c6e1e77ea2f (commit)
via 5365c9ac377ab6f579a1af32c4bfbec798417efb (commit)
via 178f56a57996651a4f8c2a20271f1e2c999279d2 (commit)
via 7115702f1b116fcf9b82ab197bab7426db10c610 (commit)
via a62894998f59d87e092a664ea50e33ff8dbb180c (commit)
via c12e46991e02c2ea59864512d2c1fb7c2b4b0f9d (commit)
from af9d532e111efecd25be155ece236826f132c0a3 (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=78ada1ffa5a64f0cac937907e851c8b6636da99e
commit 78ada1ffa5a64f0cac937907e851c8b6636da99e
Merge: af9d532 df84281
Author: Brad King
AuthorDate: Tue Sep 30 08:45:59 2014 -0400
Commit: CMake Topic Stage
CommitDate: Tue Sep 30 08:45:59 2014 -0400
Merge topic 'vs-nsight-tegra-generator' into next
df84281d Help: Add notes for topic 'vs-nsight-tegra-generator'
69e198dc VS: Generate Nsight Tegra project revision number
5365c9ac VS: Map Nsight Tegra file types in .vcxproj files
178f56a5 VS: Fix Tegra-Android platform linking of libraries by name
7115702f Tests: Add test for VS Nsight Tegra generator support
a6289499 VS: Generate ANDROID_GUI executables as app packages
c12e4699 Add 'ANDROID_API' target property to set Android Target API
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df84281d68a715658ce0068c0869dd80831cd4a7
commit df84281d68a715658ce0068c0869dd80831cd4a7
Author: Brad King
AuthorDate: Mon Sep 22 09:14:13 2014 -0400
Commit: Brad King
CommitDate: Tue Sep 30 08:45:35 2014 -0400
Help: Add notes for topic 'vs-nsight-tegra-generator'
diff --git a/Help/release/dev/vs-nsight-tegra-generator.rst
b/Help/release/dev/vs-nsight-tegra-generator.rst
new file mode 100644
index 000..92f4236
--- /dev/null
+++ b/Help/release/dev/vs-nsight-tegra-generator.rst
@@ -0,0 +1,8 @@
+vs-nsight-tegra-generator
+-
+
+* Generators for Visual Studio 10 (2010) and above learned to generate
+ projects for NVIDIA Nsight Tegra Visual Studio Edition. One may set
+ the :variable:`CMAKE_SYSTEM_NAME` variable to ``Android`` on the
+ :manual:`cmake(1)` command-line or in a :variable:`CMAKE_TOOLCHAIN_FILE`
+ to activate this platform.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=69e198dc3fd0e0d16a7b4fe5bcda4c6e1e77ea2f
commit 69e198dc3fd0e0d16a7b4fe5bcda4c6e1e77ea2f
Author: Brad King
AuthorDate: Fri Sep 26 14:57:30 2014 -0400
Commit: Brad King
CommitDate: Tue Sep 30 08:45:35 2014 -0400
VS: Generate Nsight Tegra project revision number
Nsight Tegra 2.0 will be revision '8'. Generate this revision number
and add a NsightTegraUpgradeOnceWithoutPrompt element to tell newer
versions not to prompt when upgrading the generated project file.
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx
b/Source/cmGlobalVisualStudio10Generator.cxx
index 21d1f34..d70d2af 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -620,6 +620,12 @@ bool cmGlobalVisualStudio10Generator::IsNsightTegra() const
}
//
+std::string cmGlobalVisualStudio10Generator::GetNsightTegraVersion() const
+{
+ return this->NsightTegraVersion;
+}
+
+//
std::string cmGlobalVisualStudio10Generator::GetInstalledNsightTegraVersion()
{
std::string version;
diff --git a/Source/cmGlobalVisualStudio10Generator.h
b/Source/cmGlobalVisualStudio10Generator.h
index 1df98e3..3af7b51 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -61,6 +61,7 @@ public:
/** Generating for Nsight Tegra VS plugin? */
bool IsNsightTegra() const;
+ std::string GetNsightTegraVersion() const;
/** The toolset name for the target platform. */
const char* GetPlatformToolset() const;
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index b42bf90..8ac12df 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -181,6 +181,14 @@ cmVisualStudio10TargetGenerator(cmTarget* target,
this->GUID = this->GlobalGenerator->GetGUID(this->Name.c_str());
this->Platform = gg->GetPlatformName();
this->NsightTegra = gg->IsNsightTegra();
+ for(int i =
+sscanf(gg->GetNsightTegr
[Cmake-commits] CMake branch, next, updated. v3.0.2-5527-gaf9d532
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 af9d532e111efecd25be155ece236826f132c0a3 (commit) via 5421b21ffb2b1eaae2fdb56c54a6352d61d888ee (commit) from 1291bdbecaad1b75c5e1691dd738d70b62fb15b9 (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=af9d532e111efecd25be155ece236826f132c0a3 commit af9d532e111efecd25be155ece236826f132c0a3 Merge: 1291bdb 5421b21 Author: Brad King AuthorDate: Tue Sep 30 08:45:20 2014 -0400 Commit: CMake Topic Stage CommitDate: Tue Sep 30 08:45:20 2014 -0400 Merge topic 'vs-nsight-tegra-generator' into next 5421b21f Help: Specify values allowed for ANDROID_API target property http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5421b21ffb2b1eaae2fdb56c54a6352d61d888ee commit 5421b21ffb2b1eaae2fdb56c54a6352d61d888ee Author: Brad King AuthorDate: Tue Sep 30 08:42:34 2014 -0400 Commit: Brad King CommitDate: Tue Sep 30 08:42:34 2014 -0400 Help: Specify values allowed for ANDROID_API target property diff --git a/Help/prop_tgt/ANDROID_API.rst b/Help/prop_tgt/ANDROID_API.rst index 82edb4e..714ad58 100644 --- a/Help/prop_tgt/ANDROID_API.rst +++ b/Help/prop_tgt/ANDROID_API.rst @@ -1,6 +1,7 @@ ANDROID_API --- -Set the Android Target API version (e.g. ``15``). This property is -initialized by the value of the :variable:`CMAKE_ANDROID_API` variable -if it is set when a target is created. +Set the Android Target API version (e.g. ``15``). The version number +must be a positive decimal integer. This property is initialized by +the value of the :variable:`CMAKE_ANDROID_API` variable if it is set +when a target is created. --- Summary of changes: Help/prop_tgt/ANDROID_API.rst |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.0.2-5525-g1291bdb
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 1291bdbecaad1b75c5e1691dd738d70b62fb15b9 (commit)
via a128129a867c2e659827c0378b183f50abde2e13 (commit)
from 963a33f31873bafd0b3fa95279d9c3632500c271 (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=1291bdbecaad1b75c5e1691dd738d70b62fb15b9
commit 1291bdbecaad1b75c5e1691dd738d70b62fb15b9
Merge: 963a33f a128129
Author: Brad King
AuthorDate: Tue Sep 30 08:25:31 2014 -0400
Commit: CMake Topic Stage
CommitDate: Tue Sep 30 08:25:31 2014 -0400
Merge topic 'vs-intel-15' into next
a128129a VS: Support Intel Fortran 15 .vfproj generation (#15175)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a128129a867c2e659827c0378b183f50abde2e13
commit a128129a867c2e659827c0378b183f50abde2e13
Author: Brad King
AuthorDate: Mon Sep 29 10:12:43 2014 -0400
Commit: Brad King
CommitDate: Tue Sep 30 08:24:50 2014 -0400
VS: Support Intel Fortran 15 .vfproj generation (#15175)
This version of the Intel Fortran plugin to Visual Studio says:
please make sure that $(OutDir), $(TargetName) and $(TargetExt)
property values match the value specified in %(Link.OutputFile)
We must set TargetName and TargetExt in addition to the existing
setting for OutputDirectory. The settings do not appear to hurt
older versions of Intel Fortran, so set them unconditionally.
Extend the FortranOnly test to cover a corresponding use case by
using the OUTPUT_NAME target property.
Inspired-by: Ian Harvey
diff --git a/Source/cmLocalVisualStudio7Generator.cxx
b/Source/cmLocalVisualStudio7Generator.cxx
index 11a9627..eb45423 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -796,6 +796,20 @@ void
cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
<< "\t\t\tUseOfMFC=\"" << mfcFlag << "\"\n"
<< "\t\t\tATLMinimizesCRunTimeLibraryUsage=\"false\"\n";
+ if (this->FortranProject)
+{
+// Intel Fortran >= 15.0 uses TargetName property.
+std::string targetNameFull = target.GetFullName(configName);
+std::string targetName =
+ cmSystemTools::GetFilenameWithoutLastExtension(targetNameFull);
+std::string targetExt =
+ cmSystemTools::GetFilenameLastExtension(targetNameFull);
+fout <<
+ "\t\t\tTargetName=\"" << this->EscapeForXML(targetName) << "\"\n"
+ "\t\t\tTargetExt=\"" << this->EscapeForXML(targetExt) << "\"\n"
+ ;
+}
+
// If unicode is enabled change the character set to unicode, if not
// then default to MBCS.
if(targetOptions.UsingUnicode())
diff --git a/Tests/FortranOnly/CMakeLists.txt b/Tests/FortranOnly/CMakeLists.txt
index a3f83c9..f55e727 100644
--- a/Tests/FortranOnly/CMakeLists.txt
+++ b/Tests/FortranOnly/CMakeLists.txt
@@ -8,13 +8,14 @@ set_property(TARGET FortranOnlylib PROPERTY Fortran_FORMAT
FIXED)
set_property(SOURCE world.f PROPERTY Fortran_FORMAT FREE)
# create an executable that calls hello and world
-add_executable(FortranOnly testf.f)
-target_link_libraries(FortranOnly FortranOnlylib)
+add_executable(FortranOnly1 testf.f)
+set_property(TARGET FortranOnly1 PROPERTY OUTPUT_NAME FortranOnly)
+target_link_libraries(FortranOnly1 FortranOnlylib)
-# create a custom command that runs FortranOnly and puts
+# create a custom command that runs FortranOnly1 and puts
# the output into the file testfhello.txt
add_custom_command(OUTPUT ${FortranOnly_BINARY_DIR}/testfhello.txt
- COMMAND ${FortranOnly_BINARY_DIR}/${CMAKE_CFG_INTDIR}/FortranOnly
+ COMMAND FortranOnly1
> testfhello.txt)
# create a second executable FortranOnly2 that has
# testfhello.txt has an source file so that it will
@@ -27,15 +28,15 @@ add_custom_target(checktestf2 ALL
COMMAND ${CMAKE_COMMAND}
-P ${FortranOnly_SOURCE_DIR}/checktestf2.cmake)
-# create a custom target that runs FortranOnly exectuable and creates
+# create a custom target that runs FortranOnly1 exectuable and creates
# a file out.txt that should have hello world in it.
add_custom_target(sayhello ALL
- COMMAND ${FortranOnly_BINARY_DIR}/${CMAKE_CFG_INTDIR}/FortranOnly > out.txt
+ COMMAND FortranOnly1 > out.txt
)
# make sure stuff is built in the right order
add_dependencies(checktestf2 FortranOnly2)
-add_dependencies(sayhello FortranOnly)
-add_dependencies(FortranOnly2 FortranOnly)
+add_dependencies(sayhello FortranOnly1)
+add_dependencies(FortranOnly2 FortranOnly1)
# add a custom target that checkes that out.txt has the correct
# content
-
[Cmake-commits] CMake branch, next, updated. v3.0.2-5523-g963a33f
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 963a33f31873bafd0b3fa95279d9c3632500c271 (commit)
via 13125e4da781fd136581263ab31d435ae2ab8167 (commit)
from 5748a42d9a903ec8bc1acfd8160dc2bb5e923a5f (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=963a33f31873bafd0b3fa95279d9c3632500c271
commit 963a33f31873bafd0b3fa95279d9c3632500c271
Merge: 5748a42 13125e4
Author: Stephen Kelly
AuthorDate: Tue Sep 30 03:56:18 2014 -0400
Commit: CMake Topic Stage
CommitDate: Tue Sep 30 03:56:18 2014 -0400
Merge topic 'autorcc-depends' into next
13125e4d Make sure the CMAKE_BUILD_TYPE is considered if present.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=13125e4da781fd136581263ab31d435ae2ab8167
commit 13125e4da781fd136581263ab31d435ae2ab8167
Author: Stephen Kelly
AuthorDate: Tue Sep 30 09:55:42 2014 +0200
Commit: Stephen Kelly
CommitDate: Tue Sep 30 09:55:42 2014 +0200
Make sure the CMAKE_BUILD_TYPE is considered if present.
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index c7815f6..8adf87e 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -130,7 +130,7 @@ if (NOT CMAKE_GENERATOR STREQUAL Ninja)
set(info_file "${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends/info_file.txt")
if (NOT EXISTS ${info_file})
unset(info_file)
-foreach(_config ${CMAKE_CONFIGURATION_TYPES})
+foreach(_config ${CMAKE_BUILD_TYPE} ${CMAKE_CONFIGURATION_TYPES})
set(_info_file
"${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends/info_file_${_config}.txt")
if (EXISTS ${_info_file})
set(info_file ${_info_file})
---
Summary of changes:
Tests/QtAutogen/CMakeLists.txt |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
