This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit e60c60b691e9b90a1241db2dee9573bbabf69003 Author: xuxin19 <[email protected]> AuthorDate: Mon Oct 21 21:34:44 2024 +0800 cmake(sync):fix cmake SIM build error build nuttx upstream /usr/lib/x86_64-linux-gnu/libSM.so /usr/lib/x86_64-linux-gnu/libICE.so /usr/lib/x86_64-linux-gnu/libX11.so /usr/lib/x86_64-linux-gnu/libXext.so -lpthread -lrt -lm -lasound -lmad -lv4l2 && : /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libSM.so: error adding symbols: file in wrong format Signed-off-by: xuxin19 <[email protected]> --- arch/sim/src/sim/CMakeLists.txt | 13 ++++++++----- boards/sim/sim/sim/scripts/Make.defs | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/arch/sim/src/sim/CMakeLists.txt b/arch/sim/src/sim/CMakeLists.txt index a6462e1858..ce909412b7 100644 --- a/arch/sim/src/sim/CMakeLists.txt +++ b/arch/sim/src/sim/CMakeLists.txt @@ -182,11 +182,14 @@ endif() if(CONFIG_SIM_X11FB) list(APPEND HOSTSRCS sim_x11framebuffer.c) - - find_package(X11 REQUIRED) - if(X11_FOUND) - target_include_directories(nuttx PRIVATE ${X11_INCLUDE_DIR}) - target_link_libraries(nuttx PRIVATE ${X11_LIBRARIES}) + if(APPLE) + find_package(X11 REQUIRED) + if(X11_FOUND) + target_include_directories(nuttx PRIVATE ${X11_INCLUDE_DIR}) + target_link_libraries(nuttx PRIVATE ${X11_LIBRARIES}) + endif() + else() + list(APPEND STDLIBS X11 Xext) endif() if(CONFIG_SIM_TOUCHSCREEN) diff --git a/boards/sim/sim/sim/scripts/Make.defs b/boards/sim/sim/sim/scripts/Make.defs index 36cf271537..2d03dd3200 100644 --- a/boards/sim/sim/sim/scripts/Make.defs +++ b/boards/sim/sim/sim/scripts/Make.defs @@ -18,7 +18,7 @@ # ############################################################################ -include $(TOPDIR)/.config +-include $(TOPDIR)/.config include $(TOPDIR)/tools/Config.mk # NuttX is sometimes built as a native target.
