Add metadata to CMake options; mark executables advanced to hide from default…

Add metadata to CMake options; mark executables advanced to hide from default view; fix WoW64 redirections.

CMakeLists.txt

 # CMake build script for ZeroMQ on Windows
 
 cmake_minimum_required (VERSION 2.8)
-
 project (ZeroMQ)
 
 include (${CMAKE_SOURCE_DIR}/cmake/Modules/TestZMQVersion.cmake)
 
+option (WITH_DOC "Build Reference Guide documentation (requires DocBook)" OFF)
+option (WITH_OPENPGM "Build with support for OpenPGM" OFF)
+
 # WARNING: Windows Python will override Cygwin yet not work with Asciidoc.
 #find_package (PythonInterp REQUIRED)
 # Workaround, manually set Python location
-set(PYTHON_EXECUTABLE c:/cygwin/bin/python2.6.exe)
-
-set(OPENPGM_ROOT /libpgm/libpgm-5.1.118-1~dfsg/openpgm/pgm)
-
+set(PYTHON_EXECUTABLE c:/cygwin/bin/python2.6.exe CACHE FILEPATH "Python interpreter executable")
 # TODO: Replace with FindAsciidoc.cmake
-set(ASCIIDOC_EXECUTABLE c:/cygwin/bin/asciidoc)
+set(ASCIIDOC_EXECUTABLE c:/cygwin/bin/asciidoc CACHE FILEPATH "AsciiDoc executable")
 
-option (WITH_DOC "Build Reference Guide documentation (requires DocBook)" OFF)
-option (WITH_OPENPGM "Build with support for OpenPGM" OFF)
+set(OPENPGM_ROOT /libpgm/libpgm-5.1.118-1~dfsg/openpgm/pgm CACHE PATH "Location of OpenPGM")
+
+mark_as_advanced(PYTHON_EXECUTABLE ASCIIDOC_EXECUTABLE)
 
 #-----------------------------------------------------------------------------
 # force off-tree build
@@ -295,7 +295,7 @@ else (CMAKE_SIZEOF_VOID_P EQUAL 8)
 	)
 endif (CMAKE_SIZEOF_VOID_P EQUAL 8)
 
-set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
+set (CMAKE_MODULE_PATH "${CMAKE_BINARY_DIR}")
 set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "ZeroMQ lightweight messaging kernel")
 set (CPACK_PACKAGE_VENDOR "Miru")
 set (CPACK_NSIS_CONTACT "Steven McCoy <Steven.McCoy@miru.hk>")

cmake/NSIS.template64.in

@@ -763,6 +763,9 @@ Function un.onInit
     ;Get installation folder from registry if available
 
   done:
+
+  ;Disable WoW64 redirection
+  SetRegView 64
     
 FunctionEnd
 
@@ -910,7 +913,8 @@ Function .onInit
   ; install directory that is expected to be the
   ; default
   StrCpy $IS_DEFAULT_INSTALLDIR 0
-  StrCmp "$INSTDIR" "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@" 0 +2
+  ;StrCmp "$INSTDIR" "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@" 0 +2
+  StrCmp "$INSTDIR" "$PROGRAMFILES64\@CPACK_PACKAGE_INSTALL_DIRECTORY@" 0 +2
     StrCpy $IS_DEFAULT_INSTALLDIR 1
   
   StrCpy $SV_ALLUSERS "JustMe"
@@ -919,6 +923,9 @@ Function .onInit
   StrCmp "$IS_DEFAULT_INSTALLDIR" "1" 0 +2
     StrCpy $INSTDIR "$DOCUMENTS\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
 
+  ;Disable WoW64 redirection
+  SetRegView 64
+
   ClearErrors
   UserInfo::GetName
   IfErrors noLM
@@ -943,7 +950,8 @@ Function .onInit
   done:
   StrCmp $SV_ALLUSERS "AllUsers" 0 +3
     StrCmp "$IS_DEFAULT_INSTALLDIR" "1" 0 +2
-      StrCpy $INSTDIR "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
+      ;StrCpy $INSTDIR "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
+      StrCpy $INSTDIR "$PROGRAMFILES64\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
 
   StrCmp "@CPACK_NSIS_MODIFY_PATH@" "ON" 0 noOptionsPage
     !insertmacro MUI_INSTALLOPTIONS_EXTRACT "NSIS.InstallOptions.ini"