Workaround failing Travis clang build.

[dragonfireclient.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e1639b46fefab5f4ea123222e3dd86325b63d0ed..8d03635489bdb9b80eb455c7959b69873884d7be 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,6 +6,21 @@ mark_as_advanced(EXECUTABLE_OUTPUT_PATH LIBRARY_OUTPUT_PATH)
 mark_as_advanced(JTHREAD_INCLUDE_DIR JTHREAD_LIBRARY)
 mark_as_advanced(SQLITE3_INCLUDE_DIR SQLITE3_LIBRARY)
 
+option(ENABLE_CURL "Enable cURL support for fetching media" 1)
+
+if (NOT ENABLE_CURL)
+       mark_as_advanced(CLEAR CURL_LIBRARY CURL_INCLUDE_DIR)
+endif(NOT ENABLE_CURL)
+
+if( ENABLE_CURL )
+       find_package(CURL)
+endif( ENABLE_CURL )
+set(USE_CURL 0)
+if (CURL_FOUND AND ENABLE_CURL)
+       message(STATUS "cURL support enabled")
+       set(USE_CURL 1)
+endif(CURL_FOUND AND ENABLE_CURL)
+
 # user-visible option to enable/disable gettext usage
 OPTION(ENABLE_GETTEXT "Use GetText for internationalization" 0)
 
@@ -173,6 +188,8 @@ set(common_SRCS
        log.cpp
        content_sao.cpp
        mapgen.cpp
+       mapgen_v6.cpp
+       treegen.cpp
        content_nodemeta.cpp
        content_mapnode.cpp
        collision.cpp
@@ -202,6 +219,7 @@ set(common_SRCS
        sha1.cpp
        base64.cpp
        ban.cpp
+       biome.cpp
        clientserver.cpp
        staticobject.cpp
        util/serialize.cpp
@@ -246,6 +264,7 @@ set(minetest_SRCS
        keycode.cpp
        camera.cpp
        clouds.cpp
+       particles.cpp
        clientobject.cpp
        chat.cpp
        guiMainMenu.cpp
@@ -258,10 +277,13 @@ set(minetest_SRCS
        guiDeathScreen.cpp
        guiChatConsole.cpp
        guiCreateWorld.cpp
+       guiConfigureWorld.cpp
        guiConfirmMenu.cpp
        client.cpp
        filecache.cpp
        tile.cpp
+       shader.cpp
+       serverlist.cpp
        game.cpp
        main.cpp
 )
@@ -306,6 +328,16 @@ if(BUILD_CLIENT)
                ${PLATFORM_LIBS}
                ${CLIENT_PLATFORM_LIBS}
        )
+
+       if(USE_CURL)
+               target_link_libraries(
+                       ${PROJECT_NAME}
+                       ${CURL_LIBRARY}
+               )
+               include_directories(
+                       ${CURL_INCLUDE_DIR}
+               )
+       endif(USE_CURL)
 endif(BUILD_CLIENT)
 
 if(BUILD_SERVER)
@@ -412,6 +444,9 @@ if(WIN32)
                if(VORBISFILE_DLL)
                        install(FILES ${VORBISFILE_DLL} DESTINATION ${BINDIR})
                endif()
+               if(CURL_DLL)
+                       install(FILES ${CURL_DLL} DESTINATION ${BINDIR})
+               endif()
        endif()
 endif()