Add "MINETEST_MOD_PATH" environment variable (#11515)

[minetest.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ac460883add96612dbb321b407116027e226a62e..7ae5c15d4ccaa57ab2d62da2ce5da3f43f09874b 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -101,6 +101,12 @@ endif()
 
 option(ENABLE_GLES "Use OpenGL ES instead of OpenGL" FALSE)
 mark_as_advanced(ENABLE_GLES)
+
+option(ENABLE_TOUCH "Enable Touchscreen support" FALSE)
+if(ENABLE_TOUCH)
+       add_definitions(-DHAVE_TOUCHSCREENGUI)
+endif()
+
 if(BUILD_CLIENT)
        # transitive dependency from Irrlicht (see longer explanation below)
        if(NOT WIN32)
@@ -203,6 +209,7 @@ endif(ENABLE_REDIS)
 
 find_package(SQLite3 REQUIRED)
 
+
 OPTION(ENABLE_PROMETHEUS "Enable prometheus client support" FALSE)
 set(USE_PROMETHEUS FALSE)
 
@@ -239,6 +246,10 @@ if(ENABLE_SPATIAL)
 endif(ENABLE_SPATIAL)
 
 
+find_package(ZLIB REQUIRED)
+find_package(Zstd REQUIRED)
+
+
 if(NOT MSVC)
        set(USE_GPROF FALSE CACHE BOOL "Use -pg flag for g++")
 endif()
@@ -267,13 +278,10 @@ if(WIN32)
        endif()
        set(PLATFORM_LIBS ws2_32.lib version.lib shlwapi.lib ${PLATFORM_LIBS})
 
-       # Zlib stuff
-       find_path(ZLIB_INCLUDE_DIR "zlib.h" DOC "Zlib include directory")
-       find_library(ZLIB_LIBRARIES "zlib" DOC "Path to zlib library")
-
-       # Dll's are automatically copied to the output directory by vcpkg when VCPKG_APPLOCAL_DEPS=ON
+       # DLLs are automatically copied to the output directory by vcpkg when VCPKG_APPLOCAL_DEPS=ON
        if(NOT VCPKG_APPLOCAL_DEPS)
-               find_file(ZLIB_DLL NAMES "zlib.dll" "zlib1.dll" DOC "Path to zlib.dll for installation (optional)")
+               find_file(ZLIB_DLL NAMES "" DOC "Path to Zlib DLL for installation (optional)")
+               find_file(ZSTD_DLL NAMES "" DOC "Path to Zstd DLL for installation (optional)")
                if(ENABLE_SOUND)
                        set(OPENAL_DLL "" CACHE FILEPATH "Path to OpenAL32.dll for installation (optional)")
                        set(OGG_DLL "" CACHE FILEPATH "Path to libogg.dll for installation (optional)")
@@ -293,35 +301,8 @@ else()
                if(NOT HAIKU AND NOT APPLE)
                        find_package(X11 REQUIRED)
                endif(NOT HAIKU AND NOT APPLE)
+       endif()
 
-               ##
-               # The following dependencies are transitive dependencies from Irrlicht.
-               # Minetest itself does not use them, but we link them so that statically
-               # linking Irrlicht works.
-               if(NOT HAIKU AND NOT APPLE)
-                       # This way Xxf86vm is found on OpenBSD too
-                       find_library(XXF86VM_LIBRARY Xxf86vm)
-                       mark_as_advanced(XXF86VM_LIBRARY)
-                       set(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${XXF86VM_LIBRARY})
-               endif(NOT HAIKU AND NOT APPLE)
-
-               find_package(JPEG REQUIRED)
-               find_package(PNG REQUIRED)
-               if(APPLE)
-                       find_library(CARBON_LIB Carbon REQUIRED)
-                       find_library(COCOA_LIB Cocoa REQUIRED)
-                       find_library(IOKIT_LIB IOKit REQUIRED)
-                       mark_as_advanced(
-                               CARBON_LIB
-                               COCOA_LIB
-                               IOKIT_LIB
-                       )
-                       SET(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${CARBON_LIB} ${COCOA_LIB} ${IOKIT_LIB})
-               endif(APPLE)
-               ##
-       endif(BUILD_CLIENT)
-
-       find_package(ZLIB REQUIRED)
        set(PLATFORM_LIBS -lpthread ${CMAKE_DL_LIBS})
        if(APPLE)
                set(PLATFORM_LIBS "-framework CoreFoundation" ${PLATFORM_LIBS})
@@ -511,9 +492,8 @@ endif()
 include_directories(
        ${PROJECT_BINARY_DIR}
        ${PROJECT_SOURCE_DIR}
-       ${IRRLICHT_INCLUDE_DIR}
        ${ZLIB_INCLUDE_DIR}
-       ${PNG_INCLUDE_DIR}
+       ${ZSTD_INCLUDE_DIR}
        ${SOUND_INCLUDE_DIRS}
        ${SQLITE3_INCLUDE_DIR}
        ${LUA_INCLUDE_DIR}
@@ -548,10 +528,8 @@ if(BUILD_CLIENT)
        target_link_libraries(
                ${PROJECT_NAME}
                ${ZLIB_LIBRARIES}
-               ${IRRLICHT_LIBRARY}
-               ${JPEG_LIBRARIES}
-               ${BZIP2_LIBRARIES}
-               ${PNG_LIBRARIES}
+               IrrlichtMt::IrrlichtMt
+               ${ZSTD_LIBRARY}
                ${X11_LIBRARIES}
                ${SOUND_LIBRARIES}
                ${SQLITE3_LIBRARY}
@@ -559,7 +537,6 @@ if(BUILD_CLIENT)
                ${GMP_LIBRARY}
                ${JSON_LIBRARY}
                ${PLATFORM_LIBS}
-               ${CLIENT_PLATFORM_LIBS}
        )
        if(NOT USE_LUAJIT)
                set_target_properties(${PROJECT_NAME} PROPERTIES
@@ -629,9 +606,15 @@ endif(BUILD_CLIENT)
 if(BUILD_SERVER)
        add_executable(${PROJECT_NAME}server ${server_SRCS} ${extra_windows_SRCS})
        add_dependencies(${PROJECT_NAME}server GenerateVersion)
+
+       get_target_property(
+               IRRLICHT_INCLUDES IrrlichtMt::IrrlichtMt INTERFACE_INCLUDE_DIRECTORIES)
+       # Doesn't work without PRIVATE/PUBLIC/INTERFACE mode specified.
+       target_include_directories(${PROJECT_NAME}server PRIVATE ${IRRLICHT_INCLUDES})
        target_link_libraries(
                ${PROJECT_NAME}server
                ${ZLIB_LIBRARIES}
+               ${ZSTD_LIBRARY}
                ${SQLITE3_LIBRARY}
                ${JSON_LIBRARY}
                ${LUA_LIBRARY}
@@ -848,6 +831,9 @@ if(WIN32)
                if(ZLIB_DLL)
                        install(FILES ${ZLIB_DLL} DESTINATION ${BINDIR})
                endif()
+               if(ZSTD_DLL)
+                       install(FILES ${ZSTD_DLL} DESTINATION ${BINDIR})
+               endif()
                if(BUILD_CLIENT AND FREETYPE_DLL)
                        install(FILES ${FREETYPE_DLL} DESTINATION ${BINDIR})
                endif()