mirror of
https://github.com/TES3MP/TES3MP.git
synced 2025-09-28 07:32:00 -04:00
Print paths used for server dependencies in CMake, change tabs to spaces
This commit is contained in:
parent
3c9eaad5ce
commit
10a0f165dd
@ -37,12 +37,14 @@ endif(BUILD_WITH_PAWN)
|
|||||||
option(BUILD_WITH_LUA "Enable Terra/Lua language" ON)
|
option(BUILD_WITH_LUA "Enable Terra/Lua language" ON)
|
||||||
if(BUILD_WITH_LUA)
|
if(BUILD_WITH_LUA)
|
||||||
#set(Terra_ROOT ${CMAKE_SOURCE_DIR}/external/terra/)
|
#set(Terra_ROOT ${CMAKE_SOURCE_DIR}/external/terra/)
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
find_package(Lua51 REQUIRED)
|
find_package(Lua51 REQUIRED)
|
||||||
else()
|
MESSAGE(STATUS "Found LUA_LIBRARY: ${LUA_LIBRARY}")
|
||||||
find_package(Terra REQUIRED)
|
MESSAGE(STATUS "Found LUA_INCLUDE_DIR: ${LUA_INCLUDE_DIR}")
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_TERRA")
|
else()
|
||||||
endif()
|
find_package(Terra REQUIRED)
|
||||||
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_TERRA")
|
||||||
|
endif()
|
||||||
set(LuaScript_Sources
|
set(LuaScript_Sources
|
||||||
Script/LangLua/LangLua.cpp
|
Script/LangLua/LangLua.cpp
|
||||||
Script/LangLua/LuaFunc.cpp)
|
Script/LangLua/LuaFunc.cpp)
|
||||||
@ -110,7 +112,7 @@ target_link_libraries(tes3mp-server
|
|||||||
${RakNet_LIBRARY}
|
${RakNet_LIBRARY}
|
||||||
components
|
components
|
||||||
${Terra_LIBRARY}
|
${Terra_LIBRARY}
|
||||||
${LUA_LIBRARIES}
|
${LUA_LIBRARIES}
|
||||||
${Pawn_LIBRARY}
|
${Pawn_LIBRARY}
|
||||||
${Breakpad_Library}
|
${Breakpad_Library}
|
||||||
)
|
)
|
||||||
|
@ -66,7 +66,8 @@ IF(RakNet_FOUND)
|
|||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
IF(NOT RakNet_FIND_QUIETLY)
|
IF(NOT RakNet_FIND_QUIETLY)
|
||||||
MESSAGE(STATUS "Found RakNet: ${RakNet_LIBRARIES}")
|
MESSAGE(STATUS "Found RakNet_LIBRARY_RELEASE: ${RakNet_LIBRARY_RELEASE}")
|
||||||
|
MESSAGE(STATUS "Found RakNet_INCLUDES: ${RakNet_INCLUDES}")
|
||||||
ENDIF(NOT RakNet_FIND_QUIETLY)
|
ENDIF(NOT RakNet_FIND_QUIETLY)
|
||||||
ELSE(RakNet_FOUND)
|
ELSE(RakNet_FOUND)
|
||||||
IF(RakNet_FIND_REQUIRED)
|
IF(RakNet_FIND_REQUIRED)
|
||||||
|
@ -29,8 +29,6 @@ FIND_LIBRARY (Terra_LIBRARY_DEBUG NAMES terra
|
|||||||
$ENV{Terra_ROOT}/lib
|
$ENV{Terra_ROOT}/lib
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
FIND_PATH (Terra_INCLUDES terra/terra.h
|
FIND_PATH (Terra_INCLUDES terra/terra.h
|
||||||
ENV CPATH
|
ENV CPATH
|
||||||
/usr/include
|
/usr/include
|
||||||
@ -60,7 +58,8 @@ IF(Terra_FOUND)
|
|||||||
SET(Terra_LIBRARY ${Terra_LIBRARY_RELEASE} ${ZLIB_LIBRARIES} dl tinfo)
|
SET(Terra_LIBRARY ${Terra_LIBRARY_RELEASE} ${ZLIB_LIBRARIES} dl tinfo)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
IF(NOT Terra_FIND_QUIETLY)
|
IF(NOT Terra_FIND_QUIETLY)
|
||||||
MESSAGE(STATUS "Found Terra: ${Terra_LIBRARIES}")
|
MESSAGE(STATUS "Found Terra_LIBRARIES: ${Terra_LIBRARIES}")
|
||||||
|
MESSAGE(STATUS "Found Terra_INCLUDES: ${Terra_INCLUDES}")
|
||||||
ENDIF(NOT Terra_FIND_QUIETLY)
|
ENDIF(NOT Terra_FIND_QUIETLY)
|
||||||
ELSE(Terra_FOUND)
|
ELSE(Terra_FOUND)
|
||||||
IF(Terra_FIND_REQUIRED)
|
IF(Terra_FIND_REQUIRED)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user