From 0871db30bd73d112a434f54572d34cca28de61c5 Mon Sep 17 00:00:00 2001 From: fis Date: Sat, 26 May 2018 22:58:37 +0800 Subject: [PATCH 2/2] * CMakeLists.txt: Fix flags for gcc. --- CMakeLists.txt | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eba147b..d60dcef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,20 +6,6 @@ add_executable(unit src/fifo_map.hpp test/unit.cpp) target_include_directories(unit PRIVATE "test" "src") -if(MSVC) - set(CMAKE_CXX_FLAGS - "/EHsc" - ) +set(CMAKE_CXX_FLAGS "-std=c++11 -fpermissive") - STRING(REPLACE "/O2" "/Od" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) - - add_definitions(-D_SCL_SECURE_NO_WARNINGS) -else(MSVC) - set(CMAKE_CXX_FLAGS - "-std=c++11 -stdlib=libc++" - ) -endif(MSVC) - -include_directories( - src test -) +include_directories(src test) -- 2.14.3 d class='sub right'>
aboutsummaryrefslogtreecommitdiff
path: root/gnu/machine/digital-ocean.scm
AgeCommit message (Expand)Author
2020-02-09Update e-mail address for Jakob L. Kreuze....As requested here: <https://lists.gnu.org/archive/html/guix-devel/2020-02/msg00128.html>. * .mailmap: Add an entry for Jakob. * gnu/machine.scm, gnu/machine/digital-ocean.scm, gnu/machine/ssh.scm, gnu/packages/admin.scm, gnu/packages/i2p.scm, gnu/packages/music.scm, gnu/packages/web.scm, gnu/tests/reconfigure.scm, guix/scripts/deploy.scm, guix/scripts/system/reconfigure.scm: Update their e-mail address. Tobias Geerinckx-Rice
2019-10-22machine: digital-ocean: Rename 'enable-ipv6' to 'enable-ipv6?'....* gnu/machine/digital-ocean.scm (<digital-ocean-configuration>)[enable-ipv6]: Rename to... [enable-ipv6?]: ... this. (deploy-digital-ocean): Adjust accordingly. * doc/guix.texi (Invoking guix deploy): Adjust accordingly. Ludovic Courtès
2019-10-22machine: Implement 'digital-ocean-environment-type'....* gnu/machine/digital-ocean.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * doc/guix.texi (Invoking guix deploy): Add documentation for 'digital-ocean-configuration'. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Jakob L. Kreuze