Skip to content

Commit 053b8c1

Browse files
authored
Tiny fixups (#711)
* src/board_controller: Use CMAKE_CURRENT_SOURCE_DIR also for aavaa_v3 sources * third_party/kissfft: Remove erroneous use of quotation for compile options Otherwise they'll be treated as one single argument.
1 parent 0a823f9 commit 053b8c1

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/board_controller/build.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ SET (BOARD_CONTROLLER_SRC
8383
${CMAKE_CURRENT_SOURCE_DIR}/src/board_controller/brainalive/brainalive.cpp
8484
${CMAKE_CURRENT_SOURCE_DIR}/src/board_controller/emotibit/emotibit.cpp
8585
${CMAKE_CURRENT_SOURCE_DIR}/src/board_controller/ntl/ntl_wifi.cpp
86-
${CMAKE_HOME_DIRECTORY}/src/board_controller/aavaa/aavaa_v3.cpp
86+
${CMAKE_CURRENT_SOURCE_DIR}/src/board_controller/aavaa/aavaa_v3.cpp
8787
)
8888

8989
include (${CMAKE_CURRENT_SOURCE_DIR}/src/board_controller/ant_neuro/build.cmake)
@@ -139,7 +139,7 @@ target_include_directories (
139139
${CMAKE_CURRENT_SOURCE_DIR}/src/board_controller/mentalab/inc
140140
${CMAKE_CURRENT_SOURCE_DIR}/src/board_controller/emotibit/inc
141141
${CMAKE_CURRENT_SOURCE_DIR}/src/board_controller/ntl/inc
142-
${CMAKE_HOME_DIRECTORY}/src/board_controller/aavaa/inc
142+
${CMAKE_CURRENT_SOURCE_DIR}/src/board_controller/aavaa/inc
143143
)
144144

145145
target_compile_definitions(${BOARD_CONTROLLER_NAME} PRIVATE NOMINMAX BRAINFLOW_VERSION=${BRAINFLOW_VERSION})

third_party/kissfft/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ endif()
9898
if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
9999
add_compile_options(-ffast-math -fomit-frame-pointer
100100
-W -Wall -Wcast-align -Wcast-qual -Wshadow -Wwrite-strings
101-
"$<$<COMPILE_LANGUAGE:C>:-Wstrict-prototypes;-Wmissing-prototypes;-Wnested-externs;-Wbad-function-cast>")
101+
$<$<COMPILE_LANGUAGE:C>:-Wstrict-prototypes;-Wmissing-prototypes;-Wnested-externs;-Wbad-function-cast>)
102102
endif()
103103

104104
#

third_party/kissfft/build.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ target_include_directories(kissfft PUBLIC
8888

8989
if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
9090
target_compile_options(kissfft PRIVATE
91-
"$<$<COMPILE_LANGUAGE:CXX>:-ffast-math -fomit-frame-pointer -W -Wall -Wcast-align -Wcast-qual -Wwrite-strings>"
92-
"$<$<COMPILE_LANGUAGE:C>:-Wstrict-prototypes;-Wmissing-prototypes;-Wnested-externs;-Wbad-function-cast>")
91+
$<$<COMPILE_LANGUAGE:CXX>:-ffast-math -fomit-frame-pointer -W -Wall -Wcast-align -Wcast-qual -Wwrite-strings>
92+
$<$<COMPILE_LANGUAGE:C>:-Wstrict-prototypes;-Wmissing-prototypes;-Wnested-externs;-Wbad-function-cast>)
9393
endif()
9494

9595
#

0 commit comments

Comments
 (0)