Skip to content

Commit

Permalink
build fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
KenVanHoeylandt committed Jan 24, 2024
1 parent c44b251 commit ee17ce5
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
6 changes: 5 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ cmake_minimum_required(VERSION 3.16)
add_definitions(-DTT_DEBUG)

if ($ENV{ESP_IDF_VERSION})
set(ESP_PLATFORM true)
endif()

if (ESP_PLATFORM)
message("Building with ESP-IDF v$ENV{ESP_IDF_VERSION}")
include($ENV{IDF_PATH}/tools/cmake/project.cmake)

Expand Down Expand Up @@ -38,7 +42,7 @@ add_subdirectory(libs/mlib)
add_subdirectory(tactility)
add_subdirectory(tactility-core)

if (NOT DEFINED $ENV{ESP_IDF_VERSION})
if (NOT ESP_PLATFORM)
add_subdirectory(libs/freertos-kernel)
target_include_directories(freertos-kernel
PUBLIC app-sim/src # for FreeRTOSConfig.h
Expand Down
2 changes: 1 addition & 1 deletion tactility-core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ target_include_directories(tactility-core SYSTEM
INTERFACE src/
)

if ($ENV{ESP_IDF_VERSION})
if (ESP_PLATFORM)
add_definitions(-DESP_PLATFORM)
target_link_libraries(tactility-core
PUBLIC mlib
Expand Down
2 changes: 1 addition & 1 deletion tactility/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ target_include_directories(tactility
INTERFACE src/
)

if ($ENV{ESP_IDF_VERSION})
if (ESP_PLATFORM)
add_definitions(-DESP_PLATFORM)
target_link_libraries(tactility
PUBLIC tactility-core
Expand Down

0 comments on commit ee17ce5

Please sign in to comment.