SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

fixed FindPIP with Lua

Browse Source
This commit is contained in:
Пелипенко Иван
2020-07-24 14:04:19 +03:00
parent e63aab40f6
commit cdbc401616
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -4,7 +4,7 @@ project(pip)
set(_PIP_MAJOR 1) set(_PIP_MAJOR 1)
set(_PIP_MINOR 99) set(_PIP_MINOR 99)
set(_PIP_REVISION 0) set(_PIP_REVISION 0)
set(_PIP_SUFFIX _pre_alpha) set(_PIP_SUFFIX _prealpha)
set(_PIP_COMPANY SHS) set(_PIP_COMPANY SHS)
set(_PIP_DOMAIN org.SHS) set(_PIP_DOMAIN org.SHS)

9
cmake/FindPIP.cmake
View File

@@ -97,10 +97,17 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
endif() endif()
endif() endif()
if(PIP_LUA_LIBRARY) if(PIP_LUA_LIBRARY)
if (NOT LUA_FOUND)
if(MINGW) if(MINGW)
set(LUA_INCLUDE_DIR ${MINGW_INCLUDE}) set(LUA_INCLUDE_DIR ${MINGW_INCLUDE})
set(_prev_clp "${CMAKE_LIBRARY_PATH}")
set(CMAKE_LIBRARY_PATH "${MINGW_LIB}")
endif() endif()
find_package(Lua QUIET) find_package(Lua QUIET)
if(MINGW)
set(CMAKE_LIBRARY_PATH "${_prev_clp}")
endif()
endif()
endif() endif()
if(NOT PIP_VERSION) if(NOT PIP_VERSION)
@@ -157,7 +164,7 @@ if(__module_Cloud AND __module_IOUtils)
set_target_properties(PIP::Cloud PROPERTIES INTERFACE_LINK_LIBRARIES "PIP::IOUtils") set_target_properties(PIP::Cloud PROPERTIES INTERFACE_LINK_LIBRARIES "PIP::IOUtils")
endif() endif()
if(__module_Lua) if(__module_Lua)
set_target_properties(PIP::Lua PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${LUA_INCLUDE_DIR}" INTERFACE_LINK_LIBRARIES "PIP ${LUA_LIBRARIES}") set_target_properties(PIP::Lua PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${LUA_INCLUDE_DIR}" INTERFACE_LINK_LIBRARIES "PIP;${LUA_LIBRARIES}")
endif() endif()
include(PIPMacros) include(PIPMacros)