From 10a0f165dd74d95101145c97cb135ffe7f05c073 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Thu, 12 Jan 2017 13:45:04 +0200 Subject: [PATCH] Print paths used for server dependencies in CMake, change tabs to spaces --- apps/openmw-mp/CMakeLists.txt | 16 +++++++++------- cmake/FindRakNet.cmake | 3 ++- cmake/FindTerra.cmake | 9 ++++----- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/apps/openmw-mp/CMakeLists.txt b/apps/openmw-mp/CMakeLists.txt index c66d14768..9dace0cba 100644 --- a/apps/openmw-mp/CMakeLists.txt +++ b/apps/openmw-mp/CMakeLists.txt @@ -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} ) diff --git a/cmake/FindRakNet.cmake b/cmake/FindRakNet.cmake index 3ea1fc228..7e3dd7bc4 100644 --- a/cmake/FindRakNet.cmake +++ b/cmake/FindRakNet.cmake @@ -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) diff --git a/cmake/FindTerra.cmake b/cmake/FindTerra.cmake index 6b38306cf..ce037deb3 100644 --- a/cmake/FindTerra.cmake +++ b/cmake/FindTerra.cmake @@ -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)