build, refactor: refactor build script.

fibjs · Oct 30, 2023 · 5bda216 · 5bda216
1 parent ab7a5c8
commit 5bda216
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/fibjs/addons/common.cmake b/fibjs/addons/common.cmake
@@ -14,7 +14,7 @@ include_directories(
     "${PROJECT_SOURCE_DIR}/../")
 
 if(MSVC)
-    target_link_libraries(${name} "${PROJECT_SOURCE_DIR}/../lib/node_${ARCH}.lib")
+    target_link_libraries(${name} "${PROJECT_SOURCE_DIR}/../lib/node_${BUILD_ARCH}.lib")
     set(link_flags "${link_flags} /DELAYLOAD:node.exe")
 else()
     set(link_flags "${link_flags} -Wl,-undefined,dynamic_lookup")

diff --git a/fibjs/installer/CMakeLists.txt b/fibjs/installer/CMakeLists.txt
@@ -3,11 +3,11 @@ cmake_minimum_required(VERSION 2.6)
 set(name "installer")
 project(${name})
 
-include(${CMAKE_CURRENT_LIST_DIR}/../../vender/build_tools/cmake//option.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/../../vender/build_tools/cmake/option.cmake)
 
 add_executable(${name} ${src_list})
 
-set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/../../../bin/${CMAKE_HOST_SYSTEM_NAME}_${ARCH}_${BUILD_TYPE})
+set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/../../../bin/${CMAKE_HOST_SYSTEM_NAME}_${BUILD_ARCH}_${BUILD_TYPE})
 
 include_directories("${EXECUTABLE_OUTPUT_PATH}")
 

diff --git a/fibjs/program/CMakeLists.txt b/fibjs/program/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.6)
 set(name "fibjs")
 project(${name})
 
-include(${CMAKE_CURRENT_LIST_DIR}/../../vender/build_tools/cmake//option.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/../../vender/build_tools/cmake/option.cmake)
 
 if (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
 	if(NOT MSVC)

diff --git a/tools/ubuntu_deps b/tools/ubuntu_deps
@@ -1,3 +1,4 @@
+clang,dpkg -s
 clang-12,dpkg -s
 g++,dpkg -s
 make,dpkg -s

diff --git a/vender b/vender