[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-711-g2a8dbc4

[Brad King]

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  2a8dbc4de0da103a064b0372f1ac8481664f6e83 (commit)
       via  74f7ccb53dbe088315bf558f3ed0f917b8a820d9 (commit)
       via  2b131bef1f3b7f0b85ae10974547117f9f647de9 (commit)
       via  43993aab796f7a91da26f228c8fc026af3513108 (commit)
      from  adfbae333bffef484a851a7e6c97d5a8ca459bc5 (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=2a8dbc4de0da103a064b0372f1ac8481664f6e83
commit 2a8dbc4de0da103a064b0372f1ac8481664f6e83
Merge: adfbae3 74f7ccb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 26 12:46:31 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 26 12:46:31 2015 -0400

    Merge topic 'auto_export_dll_symbols' into next
    
    74f7ccb5 Tests: Teach RunCMake.AutoExportDll to tolerate build output
    2b131bef Fix auto-export with international characters in the path
    43993aab Tests: Disable RunCMake.AutoExportDll on Watcom and Borland tools


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=74f7ccb53dbe088315bf558f3ed0f917b8a820d9
commit 74f7ccb53dbe088315bf558f3ed0f917b8a820d9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 26 12:42:19 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jun 26 12:42:19 2015 -0400

    Tests: Teach RunCMake.AutoExportDll to tolerate build output

diff --git a/Tests/RunCMake/AutoExportDll/AutoExportBuild-stderr.txt b/Tests/RunCMake/AutoExportDll/AutoExportBuild-stderr.txt
new file mode 100644
index 0000000..d483c2c
--- /dev/null
+++ b/Tests/RunCMake/AutoExportDll/AutoExportBuild-stderr.txt
@@ -0,0 +1 @@
+^.*$

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2b131bef1f3b7f0b85ae10974547117f9f647de9
commit 2b131bef1f3b7f0b85ae10974547117f9f647de9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 26 12:38:01 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jun 26 12:38:06 2015 -0400

    Fix auto-export with international characters in the path
    
    Also fix bootstrap on MSYS.

diff --git a/Source/bindexplib.cxx b/Source/bindexplib.cxx
index e94282a..659082f 100644
--- a/Source/bindexplib.cxx
+++ b/Source/bindexplib.cxx
@@ -70,6 +70,7 @@
 
 static char sccsid[] = "@(#) winDumpExts.c 1.2 95/10/03 15:27:34";
 
+#include <cmsys/Encoding.hxx>
 #include <windows.h>
 #include <stdio.h>
 #include <string>
@@ -353,7 +354,8 @@ DumpFile(const char* filename, FILE *fout)
    LPVOID lpFileBase;
    PIMAGE_DOS_HEADER dosHeader;
 
-   hFile = CreateFileA(filename, GENERIC_READ, FILE_SHARE_READ, NULL,
+   hFile = CreateFileW(cmsys::Encoding::ToWide(filename).c_str(),
+                       GENERIC_READ, FILE_SHARE_READ, NULL,
       OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
 
    if (hFile == INVALID_HANDLE_VALUE)
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 6b9923a..61e6331 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -34,7 +34,7 @@
 #include <time.h>
 
 #include <stdlib.h> // required for atoi
-#ifdef _WIN32
+#if defined(_WIN32) && defined(CMAKE_BUILD_WITH_CMAKE)
 // defined in binexplib.cxx
 void DumpFile(const char* filename, FILE *fout);
 #endif
@@ -214,7 +214,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
         }
       return 0;
       }
-#ifdef _WIN32
+#if defined(_WIN32) && defined(CMAKE_BUILD_WITH_CMAKE)
     else if(args[1] == "__create_def")
       {
       if(args.size() < 4)
@@ -223,7 +223,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
           "__create_def Usage: -E __create_def outfile.def objlistfile\n";
         return 1;
         }
-      FILE* fout = fopen(args[2].c_str(), "w+");
+      FILE* fout = cmsys::SystemTools::Fopen(args[2].c_str(), "w+");
       if(!fout)
         {
         std::cerr << "could not open output .def file: " << args[2].c_str()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43993aab796f7a91da26f228c8fc026af3513108
commit 43993aab796f7a91da26f228c8fc026af3513108
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 26 11:24:35 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jun 26 11:31:25 2015 -0400

    Tests: Disable RunCMake.AutoExportDll on Watcom and Borland tools

diff --git a/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake b/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake
index 09cd42a..f4e08ec 100644
--- a/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake
+++ b/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake
@@ -7,7 +7,7 @@ file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
 run_cmake(AutoExport)
 unset(RunCMake_TEST_OPTIONS)
 # don't run this test on VS 6 as it is not supported
-if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 6")
+if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 6|Watcom WMake|Borland Makefiles")
   return()
 endif()
 # we build debug so the say.exe will be found in Debug/say.exe for

-----------------------------------------------------------------------

Summary of changes:
 Source/bindexplib.cxx                                   |    4 +++-
 Source/cmcmd.cxx                                        |    6 +++---
 Tests/RunCMake/AutoExportDll/AutoExportBuild-stderr.txt |    1 +
 Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake         |    2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 Tests/RunCMake/AutoExportDll/AutoExportBuild-stderr.txt


hooks/post-receive
-- 
CMake