From Bootz, 11 Months ago, written in Diff-output.
Embed
  1. From 73bfb941393b53fa2c59339aa3fbdd6b91403929 Mon Sep 17 00:00:00 2001
  2. From: Bootz <bootz@projectskyfire.org>
  3. Date: Tue, 20 june 2017 11:06:42 +0200
  4. Subject: [PATCH] [Build/CMake] made a few adjustments.
  5.  
  6.  - Removed an old project name that was still lingering around.
  7.  - Added location for new OpenSSL versions.
  8.  - Fixed the requirements for MSVS 14
  9.  
  10. comments:
  11.  not sure why requirements was set to over-ride MySQL library,
  12.  but its been adjusted.
  13.  
  14. Signed-off-by: Bootz <bootz@projectskyfire.org>
  15.  
  16. ---
  17.  
  18. diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake
  19. index e315849..39a05f8 100644
  20. --- a/cmake/compiler/msvc/settings.cmake
  21. +++ b/cmake/compiler/msvc/settings.cmake
  22. @@ -26,7 +26,7 @@ endif()
  23.  set(MSVC_EXPECTED_VERSION 18.0)
  24.  
  25.  if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS MSVC_EXPECTED_VERSION)
  26. -  message(FATAL_ERROR "MSVC: SkyFire requires version ${MSVC_EXPECTED_VERSION} (MSVC 2013) to build but found ${CMAKE_CXX_COMPILER_VERSION}")
  27. +  message(FATAL_ERROR "MSVC: SkyFire requires version ${MSVC_EXPECTED_VERSION} (MSVC 2017) to build but found ${CMAKE_CXX_COMPILER_VERSION}")
  28.  endif()
  29.  
  30.  # set up output paths ofr static libraries etc (commented out - shown here as an example only)
  31. diff --git a/cmake/macros/FindOpenSSL.cmake b/cmake/macros/FindOpenSSL.cmake
  32. index 756ae33..214d45a 100644
  33. --- a/cmake/macros/FindOpenSSL.cmake
  34. +++ b/cmake/macros/FindOpenSSL.cmake
  35. @@ -51,6 +51,7 @@ ELSE()
  36.    SET(_OPENSSL_ROOT_PATHS
  37.      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]"
  38.      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]"
  39. +    "C:/OpenSSL-Win32/"
  40.      "C:/OpenSSL/"
  41.    )
  42.  ENDIF()
  43. @@ -231,7 +232,7 @@ if (OPENSSL_INCLUDE_DIR)
  44.    include(EnsureVersion)
  45.    ENSURE_VERSION( "${OPENSSL_EXPECTED_VERSION}" "${OPENSSL_VERSION}" OPENSSL_VERSION_OK)
  46.    if (NOT OPENSSL_VERSION_OK)
  47. -      message(FATAL_ERROR "TrinityCore needs OpenSSL version ${OPENSSL_EXPECTED_VERSION} but found version ${OPENSSL_VERSION}")
  48. +      message(FATAL_ERROR "SkyFire needs OpenSSL version ${OPENSSL_EXPECTED_VERSION} but found version ${OPENSSL_VERSION}")
  49.    endif()
  50.  endif (OPENSSL_INCLUDE_DIR)
  51.  
  52. diff --git a/cmake/platform/win/settings.cmake b/cmake/platform/win/settings.cmake
  53. index 8d78e84..61ccdd6 100644
  54. --- a/cmake/platform/win/settings.cmake
  55. +++ b/cmake/platform/win/settings.cmake
  56. @@ -18,10 +18,15 @@ set(ACE_LIBRARY "ace")
  57.  set(BZIP2_LIBRARIES "bzip2")
  58.  set(ZLIB_LIBRARIES "zlib")
  59.  
  60. -if((MSVC_VERSION EQUAL 1900) OR (MSVC_VERSION GREATER 1900))
  61. -  set( USE_MYSQL_SOURCES 0 )
  62. -  message(STATUS "MySQL: Disabled supplied MySQL sources")
  63. -endif((MSVC_VERSION EQUAL 1900) OR (MSVC_VERSION GREATER 1900))
  64. +# We require at least Visual Studio 2015 (aka 14.0) which has version nr 1900.
  65. +IF(NOT FORCE_UNSUPPORTED_COMPILER AND MSVC_VERSION LESS 1900)
  66. +  MESSAGE(FATAL_ERROR "Visual Studio 2015 or newer is required!")
  67. +ENDIF()
  68. +
  69. +#if((MSVC_VERSION EQUAL 1900) OR (MSVC_VERSION GREATER 1900))
  70. +#  set( USE_MYSQL_SOURCES 0 )
  71. +#  message(STATUS "MySQL: Disabled supplied MySQL sources")
  72. +#endif((MSVC_VERSION EQUAL 1900) OR (MSVC_VERSION GREATER 1900))
  73.  
  74.  if( USE_MYSQL_SOURCES )
  75.    set(MYSQL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/dep/mysqllite/include)
  76.  
  77. --
  78. 2.10.2.windows.1
  79.  
  80.