mirror of
https://github.com/platformio/platformio-core.git
synced 2025-07-30 10:07:14 +02:00
Properly replace Home Directory in CLion template on Windows
Issue #4071
This commit is contained in:
@ -53,6 +53,11 @@ set(CMAKE_CONFIGURATION_TYPES "{{ ";".join(envs) }};" CACHE STRING "Build Types
|
|||||||
set(CMAKE_CONFIGURATION_TYPES "{{ env_name }}" CACHE STRING "Build Types reflect PlatformIO Environments" FORCE)
|
set(CMAKE_CONFIGURATION_TYPES "{{ env_name }}" CACHE STRING "Build Types reflect PlatformIO Environments" FORCE)
|
||||||
% end
|
% end
|
||||||
|
|
||||||
|
# Convert "Home Directory" that may contain unescaped backslashes on Windows
|
||||||
|
% if "windows" in systype:
|
||||||
|
file(TO_CMAKE_PATH $ENV{HOMEDRIVE}$ENV{HOMEPATH} ENV_HOME_PATH)
|
||||||
|
% end
|
||||||
|
|
||||||
% if svd_path:
|
% if svd_path:
|
||||||
set(CLION_SVD_FILE_PATH "{{ _normalize_path(svd_path) }}" CACHE FILEPATH "Peripheral Registers Definitions File" FORCE)
|
set(CLION_SVD_FILE_PATH "{{ _normalize_path(svd_path) }}" CACHE FILEPATH "Peripheral Registers Definitions File" FORCE)
|
||||||
% end
|
% end
|
||||||
@ -62,11 +67,6 @@ SET(CMAKE_CXX_COMPILER "{{ _normalize_path(cxx_path) }}")
|
|||||||
SET(CMAKE_CXX_FLAGS "{{ _normalize_path(to_unix_path(cxx_flags)) }}")
|
SET(CMAKE_CXX_FLAGS "{{ _normalize_path(to_unix_path(cxx_flags)) }}")
|
||||||
SET(CMAKE_C_FLAGS "{{ _normalize_path(to_unix_path(cc_flags)) }}")
|
SET(CMAKE_C_FLAGS "{{ _normalize_path(to_unix_path(cc_flags)) }}")
|
||||||
|
|
||||||
# Convert "Home Directory" that may contain unescaped backslashes on Windows
|
|
||||||
% if "windows" in systype:
|
|
||||||
file(TO_CMAKE_PATH $ENV{HOMEDRIVE}$ENV{HOMEPATH} ENV_HOME_PATH)
|
|
||||||
% end
|
|
||||||
|
|
||||||
% STD_RE = re.compile(r"\-std=[a-z\+]+(\w+)")
|
% STD_RE = re.compile(r"\-std=[a-z\+]+(\w+)")
|
||||||
% cc_stds = STD_RE.findall(cc_flags)
|
% cc_stds = STD_RE.findall(cc_flags)
|
||||||
% cxx_stds = STD_RE.findall(cxx_flags)
|
% cxx_stds = STD_RE.findall(cxx_flags)
|
||||||
|
Reference in New Issue
Block a user