Skip to content

Commit a1c5d79

Browse files
cosmo0920edsiper
authored andcommitted
luajit-cmake: build: Avoid to use INCLUDE_DIRECTORIES property
Signed-off-by: Hiroshi Hatake <hiroshi@chronosphere.io>
1 parent fa7655a commit a1c5d79

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

cmake/luajit.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# luajit cmake
22
option(LUAJIT_DIR "Path of LuaJIT 2.1 source dir" ON)
3+
option(LUAJIT_SETUP_INCLUDE_DIR "Setup include dir if parent is present" OFF)
34
set(LUAJIT_DIR ${FLB_PATH_ROOT_SOURCE}/${FLB_PATH_LIB_LUAJIT})
45
add_subdirectory("lib/luajit-cmake")

lib/luajit-cmake/CMakeLists.txt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.5)
22

33
option(LUA_DIR "Path of Lua 5.4 source dir" OFF)
44
option(LUAJIT_DIR "Path of LuaJIT 2.1 source dir" OFF)
5+
option(LUAJIT_SETUP_INCLUDE_DIR "Setup include dir if parent is present" ON)
56

67
if(CMAKE_COMPILER_IS_GNUCC)
78
set(LUA_TARGET_SHARED ON)
@@ -17,17 +18,21 @@ if(LUAJIT_DIR)
1718
if (hasParent)
1819
set(LUA_TARGET $<TARGET_FILE:luajit> PARENT_SCOPE)
1920
set(LUA_LIBRARIES luajit::lib PARENT_SCOPE)
20-
get_target_property(LUA_INCLUDE_DIR luajit::header INCLUDE_DIRECTORIES)
21-
set(LUA_INCLUDE_DIR ${LUA_INCLUDE_DIR} PARENT_SCOPE)
21+
if (LUAJIT_SETUP_INCLUDE_DIR)
22+
get_target_property(LUA_INCLUDE_DIR luajit::header INCLUDE_DIRECTORIES)
23+
set(LUA_INCLUDE_DIR ${LUA_INCLUDE_DIR} PARENT_SCOPE)
24+
endif()
2225
endif()
2326
elseif(LUA_DIR)
2427
project(lua)
2528
include(lua.cmake)
2629
if (hasParent)
2730
set(LUA_TARGET $<TARGET_FILE:lua> PARENT_SCOPE)
2831
set(LUA_LIBRARIES lua::lib PARENT_SCOPE)
29-
get_target_property(LUA_INCLUDE_DIR lua::header INCLUDE_DIRECTORIES)
30-
set(LUA_INCLUDE_DIR ${LUA_INCLUDE_DIR} PARENT_SCOPE)
32+
if (LUAJIT_SETUP_INCLUDE_DIR)
33+
get_target_property(LUA_INCLUDE_DIR lua::header INCLUDE_DIRECTORIES)
34+
set(LUA_INCLUDE_DIR ${LUA_INCLUDE_DIR} PARENT_SCOPE)
35+
endif()
3136
endif()
3237
if (WITH_LIBFFI)
3338
include(ffi.cmake)

0 commit comments

Comments
 (0)