Merge pull request #2 from jmacheta/make_cubeide_cubemx_usable

fix builtin JRE path detection on windows
jmacheta · Apr 8, 2024 · c3bd1c8 · c3bd1c8
2 parents 4e4ac19 + c7ed80f
commit c3bd1c8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.21)
 
-project(cubemx_cmake VERSION 1.0.0)
+project(cubemx_cmake VERSION 1.0.1)
 
 option(CUBEMX_CMAKE_BUILD_TESTS "Forces building test cases" OFF)
 

diff --git a/find_cubemx.cmake b/find_cubemx.cmake
@@ -20,7 +20,7 @@ function (find_cubemx_standalone)
   message(CHECK_START "Looking for JRE")
   message(TRACE "CubeMX home directory: ${CUBEMX_HOME}")
 
-  find_file(JRE_EXE java HINTS "${CUBEMX_HOME}/jre/bin")
+  find_file(JRE_EXE NAMES java java.exe HINTS "${CUBEMX_HOME}/jre/bin")
   if (NOT JRE_EXE)
     message(CHECK_FAIL "not found")
     return()
@@ -45,7 +45,7 @@ function (find_cubeide)
   endif ()
 
   # Gather instances from Windows default installation path
-  set(CUBEIDE_DEFAULT_DIR_WINDOWS "E:/ST")
+  set(CUBEIDE_DEFAULT_DIR_WINDOWS "C:/ST")
   file(GLOB CUBEIDE_DIRS "${CUBEIDE_DEFAULT_DIR_WINDOWS}/STM32CubeIDE_*")
   list(SORT CUBEIDE_DIRS ORDER DESCENDING)
   list(APPEND CUBEIDE_PATHS "${CUBEIDE_DIRS}")