cleanup cmake preset and fixed path problem

StephanKa · arnemertz · commit 4113d1691e09 · 2023-05-11T10:50:09.000+02:00
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -333,7 +333,6 @@
         "CMAKE_CROSSCOMPILE": "ON",
         "CMAKE_SYSTEM_PROCESSOR": "arm",
         "CMAKE_TRY_COMPILE_TARGET_TYPE": "STATIC_LIBRARY",
-        "CMAKE_CXX_COMPILER_FORCED": "ON",
         "CMAKE_CROSSCOMPILING": "TRUE"
       }
     },
@@ -351,7 +350,6 @@
         "CMAKE_CROSSCOMPILE": "ON",
         "CMAKE_SYSTEM_PROCESSOR": "arm",
         "CMAKE_TRY_COMPILE_TARGET_TYPE": "STATIC_LIBRARY",
-        "CMAKE_CXX_COMPILER_FORCED": "ON",
         "CMAKE_CROSSCOMPILING": "TRUE"
       }
     }
diff --git a/src/embedded/CMakeLists.txt b/src/embedded/CMakeLists.txt
@@ -11,6 +11,6 @@ TARGET_LINK_OPTIONS(${TARGET}
                     )
 ADD_CUSTOM_TARGET(${TARGET}.bin ALL
                   DEPENDS ${TARGET}
-                  COMMAND ${CMAKE_OBJCOPY} -Obinary ${TARGET}.elf ${TARGET}.bin
-                  COMMAND ${CMAKE_OBJCOPY} -Oihex ${TARGET}.elf ${TARGET}.hex
+                  COMMAND ${CMAKE_OBJCOPY} -Obinary ${CMAKE_BINARY_DIR}/bin/${TARGET}.elf ${CMAKE_BINARY_DIR}/bin/${TARGET}.bin
+                  COMMAND ${CMAKE_OBJCOPY} -Oihex ${CMAKE_BINARY_DIR}/bin/${TARGET}.elf ${CMAKE_BINARY_DIR}/bin/${TARGET}.hex
                   )

Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,6 @@`
`333`	`333`	`"CMAKE_CROSSCOMPILE": "ON",`
`334`	`334`	`"CMAKE_SYSTEM_PROCESSOR": "arm",`
`335`	`335`	`"CMAKE_TRY_COMPILE_TARGET_TYPE": "STATIC_LIBRARY",`
`336`		`- "CMAKE_CXX_COMPILER_FORCED": "ON",`
`337`	`336`	`"CMAKE_CROSSCOMPILING": "TRUE"`
`338`	`337`	`}`
`339`	`338`	`},`
`@@ -351,7 +350,6 @@`
`351`	`350`	`"CMAKE_CROSSCOMPILE": "ON",`
`352`	`351`	`"CMAKE_SYSTEM_PROCESSOR": "arm",`
`353`	`352`	`"CMAKE_TRY_COMPILE_TARGET_TYPE": "STATIC_LIBRARY",`
`354`		`- "CMAKE_CXX_COMPILER_FORCED": "ON",`
`355`	`353`	`"CMAKE_CROSSCOMPILING": "TRUE"`
`356`	`354`	`}`
`357`	`355`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,6 @@ TARGET_LINK_OPTIONS(${TARGET}`
`11`	`11`	`)`
`12`	`12`	`ADD_CUSTOM_TARGET(${TARGET}.bin ALL`
`13`	`13`	`DEPENDS ${TARGET}`
`14`		`- COMMAND ${CMAKE_OBJCOPY} -Obinary ${TARGET}.elf ${TARGET}.bin`
`15`		`- COMMAND ${CMAKE_OBJCOPY} -Oihex ${TARGET}.elf ${TARGET}.hex`
	`14`	`+ COMMAND ${CMAKE_OBJCOPY} -Obinary ${CMAKE_BINARY_DIR}/bin/${TARGET}.elf ${CMAKE_BINARY_DIR}/bin/${TARGET}.bin`
	`15`	`+ COMMAND ${CMAKE_OBJCOPY} -Oihex ${CMAKE_BINARY_DIR}/bin/${TARGET}.elf ${CMAKE_BINARY_DIR}/bin/${TARGET}.hex`
`16`	`16`	`)`