new implementation

Author: illwieckz

CMakeLists.txt

@@ -70,18 +70,14 @@ endif()
 # FIXME: this reports an unused architecture if only vms are built.
 # We may not be able to avoid this for now without doing a huge rewrite
 # of this file.
-if (NOT (BUILD_CLIENT OR BUILD_TTY_CLIENT OR BUILD_SERVER OR BUILD_DUMMY_APP))
-    message(NOTICE "You can safely ignore the following reported architecture, it is not used.")
-endif()
-include(DaemonPlatform)
-
 # FIXME: this reports an unused compiler if only vms are built.
 # We cannot avoid this for now without doing a huge rewrite of this files
 # since we also set useless flags using informations provided by this.
 if (NOT (BUILD_CLIENT OR BUILD_TTY_CLIENT OR BUILD_SERVER OR BUILD_DUMMY_APP))
+    message(NOTICE "You can safely ignore the following reported architecture, it is not used.")
     message(NOTICE "You can safely ignore the following reported compilers, they are unused.")
 endif()
-include(DaemonCompiler)
+include(DaemonPlatform)
 
 if (Daemon_OUT)
     set(CMAKE_CURRENT_BINARY_DIR ${Daemon_OUT})
@@ -438,9 +434,11 @@ function(ADD_PRECOMPILED_HEADER Target)
     set(Header ${COMMON_DIR}/Common.h)
 
     # Compiler-specific PCH support
-    if (DAEMON_COMPILER_IS_GNUCXX OR DAEMON_COMPILER_IS_CLANGCXX OR NACL)
+    if (DAEMON_CXX_COMPILER_GCC_COMPATIBILITY OR DAEMON_CXX_COMPILER_Clang_COMPATIBILITY)
+        # There is a bug in CMake: if we set CMAKE_CXX_COMPILER to "zig;c++",
+        # only "zig" is returned when using the ${CMAKE_CXX_COMPILER} variable.
         add_custom_command(OUTPUT "${OBJ_DIR}/${Target}.h.gch"
-            COMMAND ${PNACLPYTHON_PREFIX2} ${CMAKE_CXX_COMPILER} ${CUSTOM_CXX_COMPILER_SUBCOMMAND}
+            COMMAND ${PNACLPYTHON_PREFIX2} ${CMAKE_CXX_COMPILER} ${DAEMON_CXX_COMPILER_SUBCOMMAND}
             ${Defs} ${Flags} -x c++-header ${Header} -o "${OBJ_DIR}/${Target}.h.gch"
             DEPENDS ${Header}
             IMPLICIT_DEPENDS CXX ${Header}
@@ -450,7 +448,7 @@ function(ADD_PRECOMPILED_HEADER Target)
         add_dependencies(${Target} ${Target}-pch)
 
         # PNaCl clang doesn't support -include-pch properly
-        if (DAEMON_COMPILER_IS_CLANGCXX AND NOT NACL)
+        if (NOT DAEMON_CXX_COMPILER_NAME STREQUAL "PNaCl")
             set_property(TARGET ${Target} APPEND PROPERTY COMPILE_OPTIONS "-include-pch;${OBJ_DIR}/${Target}.h.gch")
         else()
             set_property(TARGET ${Target} APPEND PROPERTY COMPILE_OPTIONS "-include;${OBJ_DIR}/${Target}.h;-Winvalid-pch")

cmake/CustomCompiler.cmake

@@ -199,9 +199,9 @@ else()
 
     if (ARCH STREQUAL "amd64")
         # K8 or EM64T minimum: AMD Athlon 64 ClawHammer, Intel Xeon Nocona, Intel Pentium 4 model F (Prescott revision EO), VIA Nano.
-        if ("${DAEMON_CXX_COMPILER_ID}" STREQUAL "Intel")
+        if ("${DAEMON_CXX_COMPILER_NAME}" STREQUAL "ICC")
             set(GCC_GENERIC_ARCH "pentium4")
-        elseif ("${DAEMON_CXX_COMPILER_ID}" STREQUAL "Zig")
+        elseif ("${DAEMON_CXX_COMPILER_NAME}" STREQUAL "Zig")
             set(GCC_GENERIC_ARCH "x86_64")
         else()
             set(GCC_GENERIC_ARCH "x86-64")
@@ -227,7 +227,7 @@ else()
     option(USE_CPU_GENERIC_ARCHITECTURE "Enforce generic -march and -mtune compiler options" ON)
     if (USE_CPU_GENERIC_ARCHITECTURE)
         set_c_cxx_flag("-march=${GCC_GENERIC_ARCH}")
-        if ("${DAEMON_CXX_COMPILER_ID}" STREQUAL "Zig")
+        if ("${DAEMON_CXX_COMPILER_NAME}" STREQUAL "Zig")
             set_c_cxx_flag("-mtune=${GCC_GENERIC_ARCH}")
         else()
             set_c_cxx_flag("-mtune=generic")

cmake/DaemonCompiler.cmake

@@ -25,13 +25,12 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 include_directories(${MOUNT_DIR} ${LIB_DIR} ${LIB_DIR}/zlib)
-include(DaemonPlatform)
-include(DaemonNacl)
 
 # Do not report unused native compiler if native vms are not built.
 # If only NACL vms are built, this will be reported in chainloaded build.
 if (BUILD_GAME_NATIVE_DLL OR BUILD_GAME_NATIVE_EXE OR NACL)
-    include(DaemonCompiler)
+	include(DaemonPlatform)
+	include(DaemonNacl)
     include(DaemonFlags)
 endif()
 

cmake/DaemonFlags.cmake

@@ -39,3 +39,4 @@ else()
 endif()
 
 include("${DAEMON_DIR}/tools/DaemonArchitecture/DaemonArchitecture.cmake")
+include("${DAEMON_DIR}/tools/DaemonCompiler/DaemonCompiler.cmake")

cmake/DaemonGame.cmake

@@ -0,0 +1,7 @@
+#! /usr/bin/env bash
+
+# test script
+
+"${1}" DaemonCompiler.cpp -o /dev/null 2>&1 \
+| grep '###REPORT###' \
+| sed -e 's/.*(###REPORT###(//;s/)###REPORT###(/=/;s/)###REPORT###).*//'