[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-185-g05cfc8f

[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  05cfc8fc2bbb1cbebeead2a811204e3e19eb6621 (commit)
       via  b102d212d64a6a056023c0517e0ec5f05e3471c8 (commit)
      from  985b15af7291ed2d24d73d204d5a16c8a00bc52c (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=05cfc8fc2bbb1cbebeead2a811204e3e19eb6621
commit 05cfc8fc2bbb1cbebeead2a811204e3e19eb6621
Merge: 985b15a b102d21
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 29 09:41:31 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 29 09:41:31 2014 -0400

    Merge topic 'wince-tests' into next
    
    b102d212 Tests: Fix enablement of Windows CE tests


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b102d212d64a6a056023c0517e0ec5f05e3471c8
commit b102d212d64a6a056023c0517e0ec5f05e3471c8
Author:     Pascal Bach <pascal.bach at siemens.com>
AuthorDate: Wed Oct 29 09:40:22 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 29 09:40:56 2014 -0400

    Tests: Fix enablement of Windows CE tests

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index d6c8272..60b50f8 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1782,7 +1782,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
 
   if(WIN32)
     # Macro to search for available Windows CE SDKs in the windows Registry
-    macro(select_wince_sdk selected_sdk)
+    macro(select_wince_sdk selected_reg selected_sdk)
       if(CMAKE_HOST_WIN32)
         execute_process(COMMAND reg QUERY "HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows CE Tools\\SDKs"
                     OUTPUT_VARIABLE sdk_reg
@@ -1790,8 +1790,15 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
         string(REGEX REPLACE "HKEY_LOCAL_MACHINE\\\\SOFTWARE\\\\Wow6432Node\\\\Microsoft\\\\Windows CE Tools\\\\SDKs\\\\"  ";" sdk_list "${sdk_reg}")
         list(LENGTH sdk_list sdk_list_len)
         if (${sdk_list_len} GREATER 1)
-          list(GET sdk_list 1 ${selected_sdk}) # The first entry is always empty due to the regex replace above
+          list(GET sdk_list 1 _sdk) # The first entry is always empty due to the regex replace above
+          string(STRIP ${_sdk} _sdk) # Make sure there is no newline in the SDK name
         endif()
+        # Build a key to be used by get_filename_component that is pointing to the SDK directory
+        set(_reg "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows CE Tools\\SDKs\\${_sdk}]")
+
+        # Set return values
+        set(${selected_reg} ${_reg})
+        set(${selected_sdk} ${_sdk})
       endif(CMAKE_HOST_WIN32)
     endmacro(select_wince_sdk)
 
@@ -1802,7 +1809,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     set(reg_ws81 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v8.1;InstallationFolder]")
     set(reg_wp80 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\WindowsPhone\\v8.0;InstallationFolder]")
     set(reg_wp81 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\WindowsPhone\\v8.1;InstallationFolder]")
-    select_wince_sdk(reg_wince)
+    select_wince_sdk(reg_wince wince_sdk)
     set(reg_tegra "[HKEY_LOCAL_MACHINE\\SOFTWARE\\NVIDIA Corporation\\Nsight Tegra;sdkRoot]")
     foreach(reg vs10 vs11 vs12 ws80 ws81 wp80 wp81 wince tegra)
       get_filename_component(r "${reg_${reg}}" ABSOLUTE)
@@ -1850,7 +1857,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     endif()
   endif()
 
-  if(WIN32 AND reg_wince)
+  if(WIN32 AND wince)
     macro(add_test_VSWinCE name generator systemName systemVersion generatorPlatform)
       # TODO: Fix the tutorial to make it work in cross compile
       # currently the MakeTable is build for target and can not be used on the host
@@ -1871,11 +1878,11 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     endmacro()
 
     if(vs11)
-      add_test_VSWinCE(vs11-ce80-ARM "Visual Studio 11 2012" WindowsCE 8.0 ${reg_wince})
+      add_test_VSWinCE(vs11-ce80-ARM "Visual Studio 11 2012" WindowsCE 8.0 ${wince_sdk})
     endif()
 
     if(vs12)
-      add_test_VSWinCE(vs12-ce80-ARM "Visual Studio 12 2013" WindowsCE 8.0 ${reg_wince})
+      add_test_VSWinCE(vs12-ce80-ARM "Visual Studio 12 2013" WindowsCE 8.0 ${wince_sdk})
     endif()
   endif()
 

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

Summary of changes:
 Tests/CMakeLists.txt |   19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake