Merge pull request #6 from gxcreator/cleanup_cmakelists

chore(cmake): cleanup CMakeLists, add .gitignore
2026-07-28 08:01:47 -07:00 · 2026-03-03 00:36:04 +01:00
parent 4cd4348c90 7c9f1c2129
commit b55c36c138
2 changed files with 163 additions and 120 deletions
@@ -0,0 +1,44 @@
+# Build directories
+build/
+build_release/
+
+# CMake
+CMakeCache.txt
+CMakeFiles/
+cmake_install.cmake
+Makefile
+_deps/
+
+# Pico SDK build artifacts
+*.uf2
+*.elf
+*.elf.map
+*.bin
+*.hex
+*.dis
+*.ld
+generated/
+pico-sdk/
+picotool/
+pioasm/
+pioasm-install/
+
+# Release binaries
+release/
+
+# IDE / Editor
+.vscode/
+.idea/
+*.swp
+*.swo
+*~
+.DS_Store
+
+# Compile commands
+compile_commands.json
+
+# ESP-IDF
+sdkconfig
+sdkconfig.old
+managed_components/
+dependencies.lock
@@ -1,19 +1,19 @@
- #
- # This file is part of the Pico FIDO2 distribution (https://github.com/polhenarejos/pico-fido2).
- # Copyright (c) 2025 Pol Henarejos.
- #
- # This program is free software: you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
- # the Free Software Foundation, version 3.
- #
- # This program is distributed in the hope that it will be useful, but
- # WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- # General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
- # along with this program. If not, see <http://www.gnu.org/licenses/>.
- #
+#
+# This file is part of the Pico FIDO2 distribution (https://github.com/polhenarejos/pico-fido2).
+# Copyright (c) 2025 Pol Henarejos.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 3.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#

 cmake_minimum_required(VERSION 3.13)

@@ -21,24 +21,22 @@ set(USB_VID 0x1D50)
 set(USB_PID 0x619B)

 if(ESP_PLATFORM)
-set(DEBUG_APDU 1)
-set(DENABLE_POWER_ON_RESET 0)
-set(EXTRA_COMPONENT_DIRS src/fido2 pico-keys-sdk/src)
-include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+    set(DEBUG_APDU 1)
+    set(EXTRA_COMPONENT_DIRS src/fido2 pico-keys-sdk/src)
+    include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 else()

-if(ENABLE_EMULATION)
-else()
-set(PICO_USE_FASTEST_SUPPORTED_CLOCK 1)
-include(pico_sdk_import.cmake)
-endif()
+    if(NOT ENABLE_EMULATION)
+        set(PICO_USE_FASTEST_SUPPORTED_CLOCK 1)
+        include(pico_sdk_import.cmake)
+    endif()

-project(pico_fido2 C CXX ASM)
+    project(pico_fido2 C CXX ASM)

-set(CMAKE_C_STANDARD 11)
-set(CMAKE_CXX_STANDARD 17)
+    set(CMAKE_C_STANDARD 11)
+    set(CMAKE_CXX_STANDARD 17)

-add_executable(pico_fido2)
+    add_executable(pico_fido2)
 endif()

 option(ENABLE_POWER_ON_RESET "Enable/disable power cycle on reset" ON)
@@ -48,7 +46,7 @@ if(ENABLE_POWER_ON_RESET)
 else()
    add_definitions(-DENABLE_POWER_ON_RESET=0)
    message(STATUS "Power cycle on reset: \t disabled")
-endif(ENABLE_POWER_ON_RESET)
+endif()

 option(ENABLE_OATH_APP "Enable/disable OATH application" ON)
 if(ENABLE_OATH_APP)
@@ -57,7 +55,7 @@ if(ENABLE_OATH_APP)
 else()
    add_definitions(-DENABLE_OATH_APP=0)
    message(STATUS "OATH Application: \t\t disabled")
-endif(ENABLE_OATH_APP)
+endif()

 option(ENABLE_OTP_APP "Enable/disable OTP application" ON)
 if(ENABLE_OTP_APP)
@@ -66,7 +64,7 @@ if(ENABLE_OTP_APP)
 else()
    add_definitions(-DENABLE_OTP_APP=0)
    message(STATUS "OTP Application: \t\t disabled")
-endif(ENABLE_OTP_APP)
+endif()

 if(ENABLE_OTP_APP OR ENABLE_OATH_APP)
    set(USB_ITF_CCID 1)
@@ -82,57 +80,57 @@ if(NOT ESP_PLATFORM)
    set(SOURCES ${PICO_KEYS_SOURCES})
 endif()

-set(SOURCES ${SOURCES}
-        ${CMAKE_CURRENT_LIST_DIR}/src/fido2/files.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/fido.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/kek.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/cmd_register.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/cmd_authenticate.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/cmd_version.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/cbor.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/cbor_reset.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/cbor_get_info.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/cbor_make_credential.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/known_apps.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/cbor_client_pin.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/credential.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/cbor_get_assertion.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/cbor_selection.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/cbor_cred_mgmt.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/cbor_config.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/cbor_vendor.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/cbor_large_blobs.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/management.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/defs.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/openpgp.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/piv.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_select.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_get_data.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_verify.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_put_data.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_select_data.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_import_data.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_version.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_change_pin.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_mse.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_internal_aut.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_challenge.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_activate_file.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_terminate_df.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_pso.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_keypair_gen.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_reset_retry.c
-        ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/do.c
-        )
-if (${ENABLE_OATH_APP})
-set(SOURCES ${SOURCES}
+list(APPEND SOURCES
+    ${CMAKE_CURRENT_LIST_DIR}/src/fido2/files.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/fido.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/kek.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/cmd_register.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/cmd_authenticate.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/cmd_version.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/cbor.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/cbor_reset.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/cbor_get_info.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/cbor_make_credential.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/known_apps.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/cbor_client_pin.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/credential.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/cbor_get_assertion.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/cbor_selection.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/cbor_cred_mgmt.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/cbor_config.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/cbor_vendor.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/cbor_large_blobs.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/management.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/defs.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/openpgp.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/piv.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_select.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_get_data.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_verify.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_put_data.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_select_data.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_import_data.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_version.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_change_pin.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_mse.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_internal_aut.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_challenge.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_activate_file.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_terminate_df.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_pso.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_keypair_gen.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/cmd_reset_retry.c
+    ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp/do.c
+)
+if(ENABLE_OATH_APP)
+    list(APPEND SOURCES
        ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/oath.c
-        )
+    )
 endif()
-if (${ENABLE_OTP_APP})
-set(SOURCES ${SOURCES}
+if(ENABLE_OTP_APP)
+    list(APPEND SOURCES
        ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/otp.c
-        )
+    )
 endif()

 SET_VERSION(ver_major ver_minor "${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido/version.h" 1)
@@ -140,50 +138,51 @@ if(ESP_PLATFORM)
    project(pico_fido2)
 endif()
 set(INCLUDES ${INCLUDES}
-        ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido
-        ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src
-        ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp
-        ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src
-        )
+    ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src/fido
+    ${CMAKE_CURRENT_LIST_DIR}/pico-fido/src
+    ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src/openpgp
+    ${CMAKE_CURRENT_LIST_DIR}/pico-openpgp/src
+)
 if(NOT ESP_PLATFORM)
-target_sources(pico_fido2 PUBLIC ${SOURCES})
-target_include_directories(pico_fido2 PUBLIC ${INCLUDES})
+    target_sources(pico_fido2 PUBLIC ${SOURCES})
+    target_include_directories(pico_fido2 PUBLIC ${INCLUDES})

-target_compile_options(pico_fido2 PUBLIC
-    -Wall
-    )
-if (NOT MSVC)
-target_compile_options(pico_fido2 PUBLIC
-    -Werror
-    )
-
-string(FIND ${CMAKE_C_COMPILER} ":" COMPILER_COLON)
-if (${COMPILER_COLON} GREATER_EQUAL 0)
-        target_compile_options(pico_fido2 PUBLIC
-        -Wno-error=use-after-free
-        )
-endif()
-endif(NOT MSVC)
-
-if(ENABLE_EMULATION)
-    if(NOT MSVC)
    target_compile_options(pico_fido2 PUBLIC
-            -fdata-sections
-            -ffunction-sections
+        -Wall
+    )
+    if(NOT MSVC)
+        target_compile_options(pico_fido2 PUBLIC
+            -Werror
+        )
+
+        # Suppress use-after-free warning for cross-compilers
+        string(FIND "${CMAKE_C_COMPILER}" ":" COMPILER_COLON)
+        if(${COMPILER_COLON} GREATER_EQUAL 0)
+            target_compile_options(pico_fido2 PUBLIC
+                -Wno-error=use-after-free
            )
-    endif(NOT MSVC)
-    if(APPLE)
-    target_link_options(pico_fido2 PUBLIC
-            -Wl,-dead_strip
+        endif()
+    endif()
+
+    if(ENABLE_EMULATION)
+        if(NOT MSVC)
+            target_compile_options(pico_fido2 PUBLIC
+                -fdata-sections
+                -ffunction-sections
            )
+        endif()
+        if(APPLE)
+            target_link_options(pico_fido2 PUBLIC
+                -Wl,-dead_strip
+            )
+        else()
+            target_link_options(pico_fido2 PUBLIC
+                -Wl,--gc-sections
+            )
+        endif()
+        target_link_libraries(pico_fido2 PRIVATE pthread m)
    else()
-    target_link_options(pico_fido2 PUBLIC
-            -Wl,--gc-sections
-            )
-    endif (APPLE)
-    target_link_libraries(pico_fido2 PRIVATE pthread m)
-else()
-target_link_libraries(pico_fido2 PRIVATE pico_keys_sdk pico_stdlib pico_multicore hardware_flash hardware_sync hardware_adc pico_unique_id pico_aon_timer tinyusb_device tinyusb_board)
-pico_add_extra_outputs(${CMAKE_PROJECT_NAME})
-endif()
+        target_link_libraries(pico_fido2 PRIVATE pico_keys_sdk pico_stdlib pico_multicore hardware_flash hardware_sync hardware_adc pico_unique_id pico_aon_timer tinyusb_device tinyusb_board)
+        pico_add_extra_outputs(${CMAKE_PROJECT_NAME})
+    endif()
 endif()