fix: cmake_easy_setup made X-platform

massonal · massonal · commit 2f8ea81568d9 · 2022-08-03T09:11:04.000+02:00
diff --git a/cmake/scripts/cmake_easy_setup.py b/cmake/scripts/cmake_easy_setup.py
@@ -63,9 +63,9 @@ def get_log(fname) :
 
 userhome = pathlib.Path.home()
 if userlibs.is_relative_to(userhome) :
-    userlibs = "$ENV{HOME}/" + str(userlibs.relative_to(userhome))
+    userlibs = "~/" + str(userlibs.relative_to(userhome))
 if corepath.is_relative_to(userhome) :
-    corepath = "$ENV{HOME}/" + str(corepath.relative_to(userhome))
+    corepath = "~/" + str(corepath.relative_to(userhome))
 
 if shargs.sketch :
     SOURCEFILE_EXTS = (".c", ".cpp", ".S", ".ino")
@@ -90,8 +90,8 @@ def get_log(fname) :
 
 with open(shargs.output or shargs.sketch/"CMakeLists.txt", "w") as out :
     out.write(cmake_template.render(
-        corepath=corepath,
-        userlibs=userlibs,
+        corepath=str(corepath).replace("\\", "\\\\"), # escape backslashes for CMake
+        userlibs=str(userlibs).replace("\\", "\\\\"),
         libs=libs,
         scriptfile=scriptname,
         tgtname=tgtname,
diff --git a/cmake/templates/easy_cmake.cmake b/cmake/templates/easy_cmake.cmake
@@ -7,8 +7,12 @@ cmake_minimum_required(VERSION 3.21)
 # STEP 1: set up bases of environment
 # -----------------------------------------------------------------------------
 
-set(CORE_PATH "{{corepath}}")
-set(USER_LIBS "{{userlibs}}")
+file(REAL_PATH "{{corepath}}" CORE_PATH EXPAND_TILDE)
+file(TO_CMAKE_PATH "{{"${CORE_PATH}"}}" CORE_PATH)
+
+file(REAL_PATH "{{userlibs}}" USER_LIBS EXPAND_TILDE)
+file(TO_CMAKE_PATH "{{"${USER_LIBS}"}}" USER_LIBS)
+
 set(BOARDNAME "{{boardname or "@board_name_here@"}}")
 
 list(APPEND CMAKE_MODULE_PATH {{"${CORE_PATH}"}}/cmake)
