From 0f61f8e18e6a8f9ee9fbc1f5633c13af6cf60639 Mon Sep 17 00:00:00 2001 From: ValKmjolnir Date: Sun, 2 Jun 2024 22:47:53 +0800 Subject: [PATCH] :bug: fix config error in cmake file --- CMakeLists.txt | 4 +++- module/makefile | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d2f7497..e6c3521 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,10 +71,12 @@ endif() set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/module) set(MODULE_USED_OBJECT_SOURCE_FILE - ${CMAKE_SOURCE_DIR}/src/nasal_misc.cpp + ${CMAKE_SOURCE_DIR}/src/util/util.cpp + ${CMAKE_SOURCE_DIR}/src/util/fs.cpp ${CMAKE_SOURCE_DIR}/src/nasal_type.cpp ${CMAKE_SOURCE_DIR}/src/nasal_gc.cpp) add_library(module-used-object STATIC ${MODULE_USED_OBJECT_SOURCE_FILE}) +target_include_directories(module-used-object PRIVATE ${CMAKE_SOURCE_DIR}/src) add_library(fib SHARED ${CMAKE_SOURCE_DIR}/module/fib.cpp) target_include_directories(fib PRIVATE ${CMAKE_SOURCE_DIR}/src) diff --git a/module/makefile b/module/makefile index 6207411..981ab8c 100644 --- a/module/makefile +++ b/module/makefile @@ -3,7 +3,7 @@ dynamic_libs_so = libfib.so libkey.so libnasock.so libmat.so dynamic_libs_dll = libfib.dll libkey.dll libnasock.dll libmat.dll -used_header = ../src/nasal.h ../src/nasal_type.h ../src/nasal_gc.h +used_header = ../src/nasal.h ../src/util/util.h ../src/nasal_type.h ../src/nasal_gc.h used_object = ../build/util.o ../build/nasal_type.o ../build/nasal_gc.o STD = c++17