Fixes for Windows

Author: Dominic Price

cmake/windows.cmake

@@ -11,11 +11,14 @@ endif()
 if (NOT VCPKG_TOOLCHAIN)
 	find_file(CMAKE_TOOLCHAIN_FILE vcpkg.cmake HINTS $ENV{userprofile} $ENV{systemdrive} PATH_SUFFIXES vcpkg/scripts/buildsystems)
 	if (CMAKE_TOOLCHAIN_FILE)
-		include(${CMAKE_TOOLCHAIN_FILE})
+		include(${CMAKE_TOOLCHAIN_FILE}) 
 	endif()
 endif()
 if (VCPKG_TOOLCHAIN)
-  message(STATUS "Found vcpkg at ${_VCPKG_ROOT_DIR}")
+  if(NOT _VCPKG_ROOT_DIR)
+    set(_VCPKG_ROOT_DIR ${Z_VCPKG_ROOT_DIR})
+  endif()
+  message(STATUS "Found vcpkg at ${Z_VCPKG_ROOT_DIR}")
 else()
   message(FATAL_ERROR "Could not find vcpkg (required for building on Visual Studio)")
 endif()

core/cadabra2_defaults.py.in

@@ -180,6 +180,8 @@ def save_history(history_path):
 
 try:
     import readline
+    if not hasattr(readline, 'redisplay'):
+      readline.redisplay = lambda: None
     history_path = os.path.join(user_data_dir(), "cadabra_history")
     if os.path.exists(history_path):
         readline.read_history_file(history_path)