dane/couch
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include lua directories for all targets (fuggit)

Browse Source
This commit is contained in:
Dane Johnson
2021-04-07 14:04:47 -05:00
parent 45d06ffd47
commit 815a1ec7ec
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/CMakeLists.txt
View File

@@ -14,6 +14,7 @@ find_package(ASSIMP REQUIRED)
if (LUA_ENABLED) if (LUA_ENABLED)
## Find Lua ## Find Lua
find_package(Lua REQUIRED) find_package(Lua REQUIRED)
include_directories(${LUA_INCLUDE_DIR})
endif () endif ()
add_library(couchlib STATIC) add_library(couchlib STATIC)
@@ -94,7 +95,6 @@ target_link_libraries(couchlib OpenGL::GL)
target_link_libraries(couchlib GLEW::GLEW) target_link_libraries(couchlib GLEW::GLEW)
if (LUA_ENABLED) if (LUA_ENABLED)
target_link_libraries(couchlib_luascripting ${LUA_LIBRARIES}) target_link_libraries(couchlib_luascripting ${LUA_LIBRARIES})
target_include_directories(couchlib_luascripting PRIVATE "${LUA_INCLUDE_DIR}")
endif () endif ()
target_link_libraries(couchlib ${BULLET_LIBRARIES}) target_link_libraries(couchlib ${BULLET_LIBRARIES})
target_link_libraries(couchlib ${ASSIMP_LIBRARY}) target_link_libraries(couchlib ${ASSIMP_LIBRARY})

4
scripting/CMakeLists.txt
View File

@@ -12,9 +12,7 @@ if (LUA_ENABLED)
LANGUAGE lua LANGUAGE lua
SOURCES couch.i lua/helpers.i) SOURCES couch.i lua/helpers.i)
target_include_directories(couchlua PRIVATE target_include_directories(couchlua PRIVATE "${PROJECT_SOURCE_DIR}/core")
"${PROJECT_SOURCE_DIR}/core"
"${LUA_INCLUDE_DIR}")
swig_link_libraries(couchlua swig_link_libraries(couchlua
PRIVATE PRIVATE