Browse Source

refactor: 将clib移除与vmlib同级

SongZihuan 4 years ago
parent
commit
e582e7ddfb

+ 4 - 1
vmcore/CMakeLists.txt

@@ -52,4 +52,7 @@ SET(VMLIB_PATH ${CMAKE_INSTALL_PREFIX}/vmlib)
 SET(CLIB_PATH ${CMAKE_INSTALL_PREFIX}/lib)
 INSTALL(DIRECTORY ${vmcore_SOURCE_DIR}/vmlib/ DESTINATION ${VMLIB_PATH})
 INSTALL(CODE "SET(ENV{VIRTUALMATHPATH} \"${VMLIB_PATH},${CLIB_PATH}\")")  # 设置系统环境变量(安装时候执行)
-INSTALL(CODE "MESSAGE(STATUS \"Now Install\")")  # 安装时运行
+INSTALL(CODE "MESSAGE(STATUS \"Now Install\")")  # 安装时运行
+
+# 安装clib
+ADD_SUBDIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/clib)

+ 0 - 0
vmcore/ofunc/clib/src/CMakeLists.txt → vmcore/clib/CMakeLists.txt


+ 0 - 0
vmcore/ofunc/clib/src/sys_lib.c → vmcore/clib/sys_lib.c


+ 0 - 0
vmcore/ofunc/clib/src/time_lib.c → vmcore/clib/time_lib.c


+ 1 - 1
vmcore/ofunc/clib/CMakeLists.txt

@@ -1,4 +1,4 @@
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SRC_FILES)
 SET(vm_managers ${SRC_FILES} PARENT_SCOPE)
 
-ADD_SUBDIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src)
+# clib的具体内容在vmcore上链接并且编译