[mr182] some cmake and build fixes

- remove useless -Wextra warning level
- pass cmake defined compiler and flags to builtin ACE
- prevent ACE configure overriding optimization level into -O3
- use correct version string in SystemConfig.h

CMakeLists.txt

@@ -284,8 +284,8 @@ endif()
 if(UNIX)
   set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} --no-warnings")
   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} --no-warnings")
-  set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Wfatal-errors -Wextra")
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wfatal-errors -Wextra")
+  set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Wfatal-errors")
+  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wfatal-errors")
 elseif(WIN32)
   # Disable warnings in Visual Studio 8 and above and add /MP
   if(MSVC AND NOT CMAKE_GENERATOR MATCHES "Visual Studio 7")
@@ -427,4 +427,4 @@ set_directory_properties(PROPERTIES COMPILE_DEFINITIONS_DEBUG "${DEFINITIONS_DEB
 add_subdirectory(src)
 # if(SQL)
 #   add_subdirectory(sql)
-# endif()
+# endif()

dep/ACE_wrappers/CMakeLists.txt

@@ -66,7 +66,7 @@ elseif(UNIX)
     BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}
     INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
     DOWNLOAD_COMMAND ""
-    CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --disable-ssl
+    CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --disable-ssl CFLAGS=${CMAKE_C_FLAGS} CXXFLAGS=${CMAKE_CXX_FLAGS} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER}
     BUILD_COMMAND ${ACE_BUILD_TOOL} -j2 # export arch="ia32" &&
     INSTALL_COMMAND ${ACE_BUILD_TOOL} install
   )

dep/ACE_wrappers/configure

@@ -10697,7 +10697,6 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
            CXXFLAGS="$CXXFLAGS"
            ACE_CXXFLAGS="$ACE_CXXFLAGS"
            DCXXFLAGS="$DCXXFLAGS"
-           OCXXFLAGS="-O3"
          fi
          ;;
      esac

src/shared/SystemConfig.h.in

@@ -29,7 +29,7 @@
 #if PLATFORM == PLATFORM_WINDOWS
 # define _VERSION(REVD,REVT,REVN,REVH) "0.17.0-DEV" " (" REVD " " REVT " Revision " REVN " - " REVH ")"
 #else
-# define _VERSION(REVD,REVT,REVN,REVH) "@VERSION@" " (" REVD " " REVT " Revision " REVN " - " REVH ")"
+# define _VERSION(REVD,REVT,REVN,REVH) "${MANGOS_VERSION}" " (" REVD " " REVT " Revision " REVN " - " REVH ")"
 #endif
 #endif
 

src/shared/revision_R2.h

@@ -1,4 +1,4 @@
 #ifndef __REVISION_R2_H__
 #define __REVISION_R2_H__
- #define REVISION_R2 "181"
+ #define REVISION_R2 "182"
 #endif // __REVISION_R2_H__