From ce2a73d1cc0b445abc9b5928e5847f618301dcb7 Mon Sep 17 00:00:00 2001 From: Petr Bena Date: Sat, 24 Mar 2018 22:31:30 +0100 Subject: [PATCH] updated lib --- huggle/CMakeLists.txt | 16 +++++++++------- huggle/libs/libirc | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/huggle/CMakeLists.txt b/huggle/CMakeLists.txt index 01bc137ce..054d27094 100644 --- a/huggle/CMakeLists.txt +++ b/huggle/CMakeLists.txt @@ -35,6 +35,15 @@ if (LINUX_SNAP) add_definitions(-DHUGGLE_SNAP) endif() +# Enable c++11 +if(WIN32) + if(MINGW) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mwindows -std=c++11") + endif() +else() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") +endif() + # This will ensure that produced binaries go to right place on windows if(NOT MINGW AND WIN32) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_BINARY_DIR}/Release) @@ -72,13 +81,6 @@ set(QT_USE_QTXML true) set(QT_USE_QTWEBKIT true) set(CMAKE_include_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) -if(WIN32) - if(MINGW) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mwindows -std=c++11") - endif() -else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") -endif() #### Qt 4 AND 5 #### if(QT5_BUILD) find_package(Qt5Core REQUIRED) diff --git a/huggle/libs/libirc b/huggle/libs/libirc index 7d3147e3b..3c59e947e 160000 --- a/huggle/libs/libirc +++ b/huggle/libs/libirc @@ -1 +1 @@ -Subproject commit 7d3147e3b11d390724bc277ad12232d0e2391efb +Subproject commit 3c59e947e7cc71e401bc5f304c569ff03cb0735a