teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Print paths used for server dependencies in CMake, change tabs to spaces

Browse source
This commit is contained in:
David Cernat 2017-01-12 13:45:04 +02:00
parent 3c9eaad5ce
commit 10a0f165dd
3 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/openmw-mp/CMakeLists.txt
View file

@ -37,12 +37,14 @@ endif(BUILD_WITH_PAWN)
option(BUILD_WITH_LUA "Enable Terra/Lua language" ON)
if(BUILD_WITH_LUA)
#set(Terra_ROOT ${CMAKE_SOURCE_DIR}/external/terra/)
if(WIN32)
find_package(Lua51 REQUIRED)
else()
find_package(Terra REQUIRED)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_TERRA")
endif()
if(WIN32)
find_package(Lua51 REQUIRED)
MESSAGE(STATUS "Found LUA_LIBRARY: ${LUA_LIBRARY}")
MESSAGE(STATUS "Found LUA_INCLUDE_DIR: ${LUA_INCLUDE_DIR}")
else()
find_package(Terra REQUIRED)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_TERRA")
endif()
set(LuaScript_Sources
Script/LangLua/LangLua.cpp
Script/LangLua/LuaFunc.cpp)
@ -110,7 +112,7 @@ target_link_libraries(tes3mp-server
${RakNet_LIBRARY}
components
${Terra_LIBRARY}
${LUA_LIBRARIES}
${LUA_LIBRARIES}
${Pawn_LIBRARY}
${Breakpad_Library}
)

3
cmake/FindRakNet.cmake
View file

@ -66,7 +66,8 @@ IF(RakNet_FOUND)
ENDIF()
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)
ELSE(RakNet_FOUND)
IF(RakNet_FIND_REQUIRED)

9
cmake/FindTerra.cmake
View file

@ -16,7 +16,7 @@ FIND_LIBRARY (Terra_LIBRARY_RELEASE NAMES terra
/opt/local/lib
$ENV{Terra_ROOT}/lib
)
FIND_LIBRARY (Terra_LIBRARY_DEBUG NAMES terra
PATHS
ENV LD_LIBRARY_PATH
@ -27,9 +27,7 @@ FIND_LIBRARY (Terra_LIBRARY_DEBUG NAMES terra
/usr/local/lib
/opt/local/lib
$ENV{Terra_ROOT}/lib
)
)
FIND_PATH (Terra_INCLUDES terra/terra.h
ENV CPATH
@ -60,7 +58,8 @@ IF(Terra_FOUND)
SET(Terra_LIBRARY ${Terra_LIBRARY_RELEASE} ${ZLIB_LIBRARIES} dl tinfo)
ENDIF()
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)
ELSE(Terra_FOUND)
IF(Terra_FIND_REQUIRED)