diff --git a/apps/openmw-mp/CMakeLists.txt b/apps/openmw-mp/CMakeLists.txt index adbf10206..1d0195325 100644 --- a/apps/openmw-mp/CMakeLists.txt +++ b/apps/openmw-mp/CMakeLists.txt @@ -15,21 +15,14 @@ if(ENABLE_BREAKPAD) include_directories(${CMAKE_SOURCE_DIR}/extern/breakpad/src ${Breakpad_Headers}) endif(ENABLE_BREAKPAD) -option(BUILD_WITH_LUA "Enable Terra/Lua language" ON) -option(FORCE_LUA "Use Lua instead Terra" OFF) -#set(Terra_ROOT ${CMAKE_SOURCE_DIR}/external/terra/) -#if(WIN32 OR FORCE_LUA) - find_package(LuaJit REQUIRED) -#[[else() - find_package(Terra REQUIRED) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_TERRA")]] -#endif() -set(LuaScript_Headers ${Terra_INCLUDES} ${LUA_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/extern/sol/sol.hpp) +find_package(LuaJit REQUIRED) + +set(LuaScript_Headers ${LUA_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/extern/sol/sol.hpp) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_LUA") -include_directories(${Terra_INCLUDES} ${LUA_INCLUDE_DIR} ${LUAJIT_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/extern/sol) +include_directories(${LUA_INCLUDE_DIR} ${LUAJIT_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/extern/sol) # local files @@ -151,7 +144,6 @@ target_link_libraries(tes3mp-server #${Boost_PROGRAM_OPTIONS_LIBRARY} ${RakNet_LIBRARY} components - ${Terra_LIBRARY} ${LUA_LIBRARIES} ${LUAJIT_LIBRARY} ${Breakpad_Library} diff --git a/cmake/FindTerra.cmake b/cmake/FindTerra.cmake deleted file mode 100644 index 199e47d0d..000000000 --- a/cmake/FindTerra.cmake +++ /dev/null @@ -1,69 +0,0 @@ -# - Try to find Terra -# Once done this will define -# -# Terra_FOUND - system has Terra -# Terra_INCLUDES - the Terra include directory -# Terra_LIBRARY - Link these to use Terra - -FIND_LIBRARY (Terra_LIBRARY_RELEASE NAMES terra - PATHS - ENV LD_LIBRARY_PATH - ENV LIBRARY_PATH - /usr/lib64 - /usr/lib - /usr/local/lib64 - /usr/local/lib - /opt/local/lib - $ENV{Terra_ROOT}/lib - ) - -FIND_LIBRARY (Terra_LIBRARY_DEBUG NAMES terra - PATHS - ENV LD_LIBRARY_PATH - ENV LIBRARY_PATH - /usr/lib64 - /usr/lib - /usr/local/lib64 - /usr/local/lib - /opt/local/lib - $ENV{Terra_ROOT}/lib - ) - -FIND_PATH (Terra_INCLUDES terra/terra.h - ENV CPATH - /usr/include - /usr/local/include - /opt/local/include - $ENV{Terra_ROOT}/include - ) - -IF(Terra_INCLUDES AND Terra_LIBRARY_RELEASE) - SET(Terra_FOUND TRUE) -ENDIF(Terra_INCLUDES AND Terra_LIBRARY_RELEASE) - -IF(NOT Terra_LIBRARY_DEBUG) - SET(Terra_LIBRARY_DEBUG ${Terra_LIBRARY_RELEASE}) -ENDIF() - -IF(Terra_FOUND) - SET(Terra_INCLUDES ${Terra_INCLUDES}) - - find_package(ZLIB REQUIRED) - - IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) - SET(Terra_LIBRARY optimized ${Terra_LIBRARY_RELEASE} debug ${Terra_LIBRARY_DEBUG} ${ZLIB_LIBRARIES} dl tinfo) - ELSE() - # if there are no configuration types and CMAKE_BUILD_TYPE has no value - # then just use the release libraries - SET(Terra_LIBRARY ${Terra_LIBRARY_RELEASE} ${ZLIB_LIBRARIES} dl tinfo) - ENDIF() - IF(NOT Terra_FIND_QUIETLY) - MESSAGE(STATUS "Found Terra_LIBRARY_RELEASE: ${Terra_LIBRARY_RELEASE}") - MESSAGE(STATUS "Found Terra_INCLUDES: ${Terra_INCLUDES}") - ENDIF(NOT Terra_FIND_QUIETLY) -ELSE(Terra_FOUND) - IF(Terra_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find Terra") - ENDIF(Terra_FIND_REQUIRED) -ENDIF(Terra_FOUND) -