Skip to content

Commit

Permalink
CMakeLists.txt: Do not require C++ (#3956)
Browse files Browse the repository at this point in the history
By default, the project() CMake command defaults to C and C++. [1]
Therefore, CMake might perform tests for both C and C++ compilers as
part of the configuration phase.

However, this has the consequence of the configuration phase to fail if
the system does not have a C++ toolchain installed, even if C++ is not
really used by the top-level project under the default settings.

Some configurations might still require a C++ toolchain, so
enable_language is selectively called under such circumstances.

[1]: https://cmake.org/cmake/help/latest/command/project.html
  • Loading branch information
midokura-xavi92 authored Dec 20, 2024
1 parent f8f37c8 commit 9598611
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if(ESP_PLATFORM)
return()
endif()

project (iwasm)
project (iwasm LANGUAGES C)

set(CMAKE_CXX_STANDARD 17)

Expand Down
1 change: 1 addition & 0 deletions core/iwasm/compilation/iwasm_compl.cmake
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
set (IWASM_COMPL_DIR ${CMAKE_CURRENT_LIST_DIR})

include_directories(${IWASM_COMPL_DIR})
enable_language(CXX)

if (WAMR_BUILD_DEBUG_AOT EQUAL 1)
file (GLOB_RECURSE source_all
Expand Down
1 change: 1 addition & 0 deletions core/iwasm/fast-jit/iwasm_fast_jit.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ if (WAMR_BUILD_FAST_JIT_DUMP EQUAL 1)
endif ()

include_directories (${IWASM_FAST_JIT_DIR})
enable_language(CXX)

if (WAMR_BUILD_TARGET STREQUAL "X86_64" OR WAMR_BUILD_TARGET STREQUAL "AMD_64")
include(FetchContent)
Expand Down
1 change: 1 addition & 0 deletions core/iwasm/libraries/wasi-nn/cmake/wasi_nn.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ add_compile_definitions(
# - tflite
if(WAMR_BUILD_WASI_NN_TFLITE EQUAL 1)
find_package(tensorflow_lite REQUIRED)
enable_language(CXX)

add_library(
wasi_nn_tflite
Expand Down
1 change: 1 addition & 0 deletions core/shared/platform/windows/shared_platform.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ set (PLATFORM_SHARED_DIR ${CMAKE_CURRENT_LIST_DIR})
add_definitions(-DBH_PLATFORM_WINDOWS)
add_definitions(-DHAVE_STRUCT_TIMESPEC)
add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS)
enable_language(CXX)

include_directories(${PLATFORM_SHARED_DIR})
include_directories(${PLATFORM_SHARED_DIR}/../include)
Expand Down

0 comments on commit 9598611

Please sign in to comment.