Ver Fonte

Fix the problem of enabling C++11 standard for MinGW on Windows host.

Yao Wei Tjong 姚伟忠 há 10 anos atrás
pai
commit
ff1278051f
1 ficheiros alterados com 2 adições e 2 exclusões
  1. 2 2
      CMake/Modules/Urho3D-CMake-common.cmake

+ 2 - 2
CMake/Modules/Urho3D-CMake-common.cmake

@@ -478,11 +478,11 @@ endif ()
 
 # Platform and compiler specific options
 if (URHO3D_C++11)
-    add_definitions (-DURHO3D_CPP11)   # Note the define is NOT 'URHO3D_C++11'!
+    add_definitions (-DURHO3D_CXX11)   # Note the define is NOT 'URHO3D_C++11'!
     if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
         # Use gnu++11/gnu++0x instead of c++11/c++0x as the latter does not work as expected when cross compiling
         foreach (STANDARD gnu++11 gnu++0x)  # Fallback to gnu++0x on older GCC version
-            execute_process (COMMAND echo COMMAND ${CMAKE_CXX_COMPILER} -std=${STANDARD} -E - RESULT_VARIABLE GCC_EXIT_CODE OUTPUT_QUIET ERROR_QUIET)
+            execute_process (COMMAND ${CMAKE_COMMAND} -E echo COMMAND ${CMAKE_CXX_COMPILER} -std=${STANDARD} -E - RESULT_VARIABLE GCC_EXIT_CODE OUTPUT_QUIET ERROR_QUIET)
             if (GCC_EXIT_CODE EQUAL 0)
                 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=${STANDARD}")
                 break ()