Remove Android makefile ugly make -j hack

[minetest.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e5245534cd12145cd4dfe319121c0dcb4636d6b3..2ce1086813ea7307b72e4e97150d90d1e2a890c4 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -352,16 +352,19 @@ add_custom_target(GenerateVersion
        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
 
 add_subdirectory(jthread)
+add_subdirectory(network)
 add_subdirectory(script)
 add_subdirectory(util)
 
+set (unittests_SRCS
+       test.cpp
+)
+
 set(common_SRCS
        ban.cpp
-       base64.cpp
        cavegen.cpp
        clientiface.cpp
        collision.cpp
-       connection.cpp
        content_abm.cpp
        content_mapnode.cpp
        content_nodemeta.cpp
@@ -418,23 +421,20 @@ set(common_SRCS
        serverlist.cpp
        serverobject.cpp
        settings.cpp
-       sha1.cpp
        socket.cpp
        sound.cpp
        staticobject.cpp
        subgame.cpp
-       test.cpp
        tool.cpp
        treegen.cpp
        version.cpp
        voxel.cpp
        voxelalgorithms.cpp
-       network/networkpacket.cpp
-       network/serveropcodes.cpp
-       network/toserverpacket.cpp
+       ${common_network_SRCS}
        ${JTHREAD_SRCS}
        ${common_SCRIPT_SRCS}
        ${UTIL_SRCS}
+       ${unittests_SRCS}
 )
 
 # This gives us the icon and file version information
@@ -457,9 +457,16 @@ if(WIN32)
 endif()
 
 # Client sources
+
+if (BUILD_CLIENT)
+       add_subdirectory(client)
+endif(BUILD_CLIENT)
+
 set(minetest_SRCS
        ${common_SRCS}
        ${sound_SRCS}
+       ${client_SRCS}
+       ${client_network_SRCS}
        camera.cpp
        chat.cpp
        client.cpp
@@ -492,10 +499,7 @@ set(minetest_SRCS
        particles.cpp
        shader.cpp
        sky.cpp
-       tile.cpp
        wieldmesh.cpp
-       network/clientopcodes.cpp
-       network/toclientpacket.cpp
        ${minetest_SCRIPT_SRCS}
 )
 list(SORT minetest_SRCS)
@@ -733,7 +737,20 @@ if(WIN32)
 endif()
 
 if(BUILD_CLIENT)
-       install(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
+       install(TARGETS ${PROJECT_NAME}
+               RUNTIME DESTINATION ${BINDIR}
+               LIBRARY DESTINATION ${BINDIR}
+               ARCHIVE DESTINATION ${BINDIR}
+               BUNDLE DESTINATION .
+       )
+
+       if(APPLE)
+               install(CODE "
+                       set(BU_CHMOD_BUNDLE_ITEMS ON)
+                       include(BundleUtilities)
+                       fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/${BUNDLE_PATH}\" \"\" \"\${CMAKE_INSTALL_PREFIX}/${BINDIR}\")
+               " COMPONENT Runtime)
+       endif()
 
        if(USE_GETTEXT)
                foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})