7.3.4

updated QV, QK for MSP430 removed the unsupported esp-idf port Cmake support
QuantumLeaps · Mar 21, 2024 · 340b6bb · 340b6bb
1 parent fcea994
commit 340b6bb
Show file tree

Hide file tree

Showing 29 changed files with 137 additions and 1,325 deletions.
diff --git a/3rd_party b/3rd_party
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -132,36 +132,25 @@ add_subdirectory(src)
 add_subdirectory(ports)
 
 # set general defines
-target_compile_definitions(qpc
-    PRIVATE
-        $<$<BOOL:${ADD_DEBUG_CODE}>:${ADD_DEBUG_CODE}>
-        $<$<BOOL:${QPC_CFG_GUI}>:QWIN_GUI>
-        $<$<CONFIG:Spy>:Q_SPY>
-        $<$<AND:$<CONFIG:Spy>,$<BOOL:${QPC_CFG_UNIT_TEST}>>:Q_UTEST>
+target_compile_definitions(qpc PRIVATE
+    $<$<BOOL:${ADD_DEBUG_CODE}>:${ADD_DEBUG_CODE}>
+    $<$<BOOL:${QPC_CFG_GUI}>:QWIN_GUI>
+    # $<$<CONFIG:Spy>:Q_SPY> # set via toolchain file
+    $<$<AND:$<CONFIG:Spy>,$<BOOL:${QPC_CFG_UNIT_TEST}>>:Q_UTEST>
 )
 
-target_compile_options(qpc
-    PRIVATE
-        $<$<BOOL:${QPC_CFG_VERBOSE}>:-v>
+target_compile_options(qpc PRIVATE
+    $<$<BOOL:${QPC_CFG_VERBOSE}>:-v>
 )
 
-target_link_options(qpc
-    PRIVATE
-        $<$<BOOL:${QPC_CFG_VERBOSE}>:-v>
+target_link_options(qpc PRIVATE
+    $<$<BOOL:${QPC_CFG_VERBOSE}>:-v>
 )
 
-target_link_libraries(qpc
-    PUBLIC
-        $<$<AND:$<CONFIG:Spy>,$<STREQUAL:win32,${PORT}>>:ws2_32>
+target_link_libraries(qpc PUBLIC
+    $<$<AND:$<CONFIG:Spy>,$<STREQUAL:win32,${PORT}>>:ws2_32>
 )
 
-# set position independent code compile/link parameters
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.14")
-    include(CheckPIESupported)
-    check_pie_supported()
-endif()
-set_property(TARGET qpc PROPERTY POSITION_INDEPENDENT_CODE FALSE)
-
 # print configuration
 message(STATUS
 "========================================================

diff --git a/examples b/examples
diff --git a/ports/CMakeLists.txt b/ports/CMakeLists.txt
@@ -1,5 +1,4 @@
 # CMake the qpc libraries for different targets
-# target may be "Windows", "Posix", "TLE984x"
 set(PORT_DIR ${PORT})
 if((PORT STREQUAL win32) OR (PORT STREQUAL posix))
     if(QPC_CFG_UNIT_TEST)

diff --git a/ports/arm-cm/CMakeLists.txt b/ports/arm-cm/CMakeLists.txt
@@ -15,8 +15,5 @@ else()
     target_include_directories(qpc PUBLIC ${KERNEL}/${_compiler_})
 endif()
 
-if(EXISTS ${KERNEL}/config)
-    target_include_directories(qpc PRIVATE ${KERNEL}/config)
-endif()
 target_sources(qpc PRIVATE ${KERNEL}/${_compiler_}/${qx_port_c})
 
diff --git a/ports/arm-cr/CMakeLists.txt b/ports/arm-cr/CMakeLists.txt
@@ -11,5 +11,4 @@ if(NOT KERNEL MATCHES "q[vk]")
     message(WARNING "Kernel ${KERNEL} is not supported! Falling back to QV kernel")
     set(KERNEL qv)
 endif()
-target_include_directories(qpc PUBLIC ${KERNEL}/${_compiler_} ${KERNEL}/config)
-
+target_include_directories(qpc PUBLIC ${KERNEL}/${_compiler_})
diff --git a/ports/esp-idf/CMakeLists.txt b/ports/esp-idf/CMakeLists.txt
diff --git a/ports/esp-idf/README.md b/ports/esp-idf/README.md