Added HOME_PATH determination using Windows API. It's required to handle

cases when user directory contains non-ascii characters.
xthebat · Dec 6, 2015 · 8311b39 · 8311b39
1 parent fbde7bc
commit 8311b39
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/OptolithiumC/plugins/CMakeLists.txt b/OptolithiumC/plugins/CMakeLists.txt
@@ -1,6 +1,8 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 CMAKE_POLICY(SET CMP0015 NEW)
-CMAKE_POLICY(SET CMP0054 OLD)
+IF (WIN32)
+  CMAKE_POLICY(SET CMP0054 OLD)
+ENDIF()
 
 SET(CMAKE_BUILD_TYPE "Release")
 SET(BUILD_DIR "build")

diff --git a/OptolithiumGui/config.py b/OptolithiumGui/config.py
@@ -28,6 +28,7 @@
 import logging as module_logging
 import sys
 import helpers
+import ctypes
 
 
 __author__ = 'Alexei Gladkikh'
@@ -113,7 +114,13 @@
 
 KLAYOUT_PATH = "klayout"
 
-HOME_PATH = os.path.expanduser("~")
+if sys.platform == nt:
+    buf = ctypes.create_unicode_buffer(1024)
+    ctypes.windll.kernel32.GetEnvironmentVariableW(u"USERPROFILE", buf, 1024)
+    HOME_PATH = buf.value
+else:
+    HOME_PATH = os.path.expanduser("~")
+
 APPLICATION_DIRECTORY = "." + APPLICATION_NAME
 CONFIG_NAME = "config.json"