From 1b89f1f6a1a67cadee58866258b17cb83c01ef21 Mon Sep 17 00:00:00 2001 From: H0zen Date: Thu, 6 Oct 2016 20:57:46 +0300 Subject: [PATCH] Revert commit [c3cbd52]. Breaks Eluna. --- cmake/SetDefinitions.cmake | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/cmake/SetDefinitions.cmake b/cmake/SetDefinitions.cmake index c9caafbd..77a27904 100644 --- a/cmake/SetDefinitions.cmake +++ b/cmake/SetDefinitions.cmake @@ -41,7 +41,7 @@ if(WIN32) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) set(BIN_DIR ${CMAKE_INSTALL_PREFIX}/) set(LIBS_DIR ${CMAKE_INSTALL_PREFIX}/) - + if(MSVC) if(PLATFORM EQUAL 64) # This definition is necessary to work around a bug with Intellisense described @@ -65,11 +65,6 @@ if(WIN32) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /MP") endif() - if(CMAKE_GENERATOR MATCHES "Visual Studio 14.*") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fp:strict") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:strict") - endif() - # Specify the maximum PreCompiled Header memory allocation limit # Fixes a compiler-problem when using PCH - the /Ym flag is adjusted by the compiler in MSVC2012, hence we need to set an upper limit with /Zm to avoid discrepancies) # (And yes, this is a verified , unresolved bug with MSVC... *sigh*) @@ -94,13 +89,13 @@ if(WIN32) elseif(UNIX) set(BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin) set(LIBS_DIR ${CMAKE_INSTALL_PREFIX}/lib) - + # For Unix systems set the rpath so that libraries are found set(CMAKE_INSTALL_RPATH "${LIBS_DIR}") set(CMAKE_INSTALL_NAME_DIR "${LIBS_DIR}") # Run out of build tree set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF) - + # Add uninstall script and target configure_file( "${CMAKE_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" @@ -111,7 +106,7 @@ elseif(UNIX) add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake" ) - + if(CMAKE_C_COMPILER MATCHES "gcc" OR CMAKE_C_COMPILER_ID STREQUAL "GNU") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") @@ -121,7 +116,7 @@ elseif(UNIX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SSE_FLAGS}") endif() add_definitions(-DHAVE_SSE2) - + if(NOT DEBUG) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --no-warnings") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --no-warnings -std=c++11 -Wno-narrowing -Wno-deprecated-register")