Commented out debug statements again

[oweals/minetest.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5bdfc7eeeb17ff4277326cd648296c61409aad67..80ee0fc649fe4399a1a808b85cb34c9932b876a8 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -127,6 +127,7 @@ set(common_SRCS
        test.cpp
        sha1.cpp
        base64.cpp
+       ban.cpp
 )
 
 # This gives us the icon
@@ -141,6 +142,7 @@ set(minetest_SRCS
        mapblock_mesh.cpp
        farmesh.cpp
        keycode.cpp
+       camera.cpp
        clouds.cpp
        clientobject.cpp
        guiMainMenu.cpp
@@ -173,7 +175,7 @@ include_directories(
        ${SQLITE3_INCLUDE_DIR}
 )
 
-set(EXECUTABLE_OUTPUT_PATH ../bin)
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin")
 
 if(BUILD_CLIENT)
        add_executable(${PROJECT_NAME} ${minetest_SRCS})
@@ -209,7 +211,7 @@ endif(BUILD_SERVER)
 # Set some optimizations and tweaks
 #
 
-include(CheckCCompilerFlag)
+include(CheckCXXCompilerFlag)
 
 if(MSVC)
        # Visual Studio
@@ -237,8 +239,8 @@ else()
                set(RELEASE_WARNING_FLAGS "")
        endif()
        
-       if(NOT APPLE)
-               check_c_compiler_flag("-Wno-unused-but-set-variable" HAS_UNUSED_BUT_SET_VARIABLE_WARNING)
+       if(NOT APPLE AND NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+               CHECK_CXX_COMPILER_FLAG("-Wno-unused-but-set-variable" HAS_UNUSED_BUT_SET_VARIABLE_WARNING)
                if(HAS_UNUSED_BUT_SET_VARIABLE_WARNING)
                        set(WARNING_FLAGS "${WARNING_FLAGS} -Wno-unused-but-set-variable")
                endif(HAS_UNUSED_BUT_SET_VARIABLE_WARNING)