v8, refactor: use relative path in cmake.

fibjs · Jan 6, 2023 · 206805d · 206805d
1 parent 2b08a65
commit 206805d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 18 deletions.
diff --git a/jssdk/CMakeLists.txt b/jssdk/CMakeLists.txt
@@ -1,11 +1,5 @@
 cmake_minimum_required(VERSION 2.6)
 
-include_directories(
-    "${PROJECT_SOURCE_DIR}/../v8"
-    "${PROJECT_SOURCE_DIR}/../v8/include"
-    "${PROJECT_SOURCE_DIR}/.."
-)
-
 include(../v8/cmake/options.cmake)
 
 include(../build_tools/cmake/Library.cmake)
diff --git a/jssdk/test/CMakeLists.txt b/jssdk/test/CMakeLists.txt
@@ -3,6 +3,6 @@ cmake_minimum_required(VERSION 2.6)
 set(test_libs gtest)
 set(libs v8 exlib)
 
-include_directories("${PROJECT_SOURCE_DIR}/../../v8/include")
+include(../../v8/cmake/options.cmake)
 
 include(../../build_tools/cmake/LibraryTest.cmake)
diff --git a/v8/cmake/options.cmake b/v8/cmake/options.cmake
@@ -1,9 +1,12 @@
-include_directories(${PROJECT_SOURCE_DIR})
+include_directories(
+	${CMAKE_CURRENT_LIST_DIR}/..
+	${CMAKE_CURRENT_LIST_DIR}/../include
+)
 
 if(${ARCH} MATCHES "64")
-	include_directories(${PROJECT_SOURCE_DIR}/gen/64)
+	include_directories(${CMAKE_CURRENT_LIST_DIR}/../gen/64)
 else()
-	include_directories(${PROJECT_SOURCE_DIR}/gen/32)
+	include_directories(${CMAKE_CURRENT_LIST_DIR}/../gen/32)
 endif()
 
 if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")

diff --git a/v8/test/CMakeLists.txt b/v8/test/CMakeLists.txt
@@ -3,13 +3,5 @@ cmake_minimum_required(VERSION 2.6)
 set(test_libs gtest)
 set(libs exlib)
 
-include_directories(${PROJECT_SOURCE_DIR}/..)
-
-if(${ARCH} MATCHES "64")
-	include_directories(${PROJECT_SOURCE_DIR}/../gen/64)
-else()
-	include_directories(${PROJECT_SOURCE_DIR}/../gen/32)
-endif()
-
 include(../cmake/options.cmake)
 include(../../build_tools/cmake/LibraryTest.cmake)