diff --git a/CMakeLists.txt b/CMakeLists.txt index f7a095b0..5a0fe738 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(pip) set(_PIP_MAJOR 1) set(_PIP_MINOR 99) set(_PIP_REVISION 0) -set(_PIP_SUFFIX _pre_alpha) +set(_PIP_SUFFIX _prealpha) set(_PIP_COMPANY SHS) set(_PIP_DOMAIN org.SHS) diff --git a/cmake/FindPIP.cmake b/cmake/FindPIP.cmake index 52678bef..0752e873 100644 --- a/cmake/FindPIP.cmake +++ b/cmake/FindPIP.cmake @@ -97,10 +97,17 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") endif() endif() if(PIP_LUA_LIBRARY) - if(MINGW) - set(LUA_INCLUDE_DIR ${MINGW_INCLUDE}) + if (NOT LUA_FOUND) + if(MINGW) + set(LUA_INCLUDE_DIR ${MINGW_INCLUDE}) + set(_prev_clp "${CMAKE_LIBRARY_PATH}") + set(CMAKE_LIBRARY_PATH "${MINGW_LIB}") + endif() + find_package(Lua QUIET) + if(MINGW) + set(CMAKE_LIBRARY_PATH "${_prev_clp}") + endif() endif() - find_package(Lua QUIET) endif() 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") endif() 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() include(PIPMacros)