diff options
| author | Hans Erik van Elburg <hanserik@vanelburg.net> | 2015-01-04 13:57:31 +0100 |
|---|---|---|
| committer | Hans Erik van Elburg <hanserik@vanelburg.net> | 2015-01-04 13:57:31 +0100 |
| commit | 98f67600a86803f2e28c9742f88d54c23ea71cc7 (patch) | |
| tree | 2cdeaf5019b8ec5560c5dcd929fed6913f58c224 | |
| parent | 599af4642c24ab8db542aec19a25c367f3ed01f8 (diff) | |
| download | fork-ledger-98f67600a86803f2e28c9742f88d54c23ea71cc7.tar.gz fork-ledger-98f67600a86803f2e28c9742f88d54c23ea71cc7.tar.bz2 fork-ledger-98f67600a86803f2e28c9742f88d54c23ea71cc7.zip | |
merge double fix + make changes minimalistic
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 20 |
2 files changed, 9 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 30c6519e..70b5fe1a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,12 +13,7 @@ set(Ledger_VERSION_DATE 20141005) enable_testing() -if (CYGWIN) - add_definitions(-std=c++11 -U__STRICT_ANSI__) -else() - add_definitions(-std=c++11) -endif() - +add_definitions(-std=c++11) if (CYGWIN) add_definitions(-U__STRICT_ANSI__) endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dcafeba2..7b10061f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -167,12 +167,10 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug") if (BUILD_LIBRARY) list(APPEND _args ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}) endif() - if (CYGWIN) - list(APPEND _args "-std=c++11 ") - list(APPEND _args "-U__STRICT_ANSI__") - else() - list(APPEND _args "-std=c++11 ") - endif() + list(APPEND _args "-std=c++11 ") + if (CYGWIN) + list(APPEND _args "-U__STRICT_ANSI__") + endif() list(APPEND _args "-x c++-header " ${_inc}) list(APPEND _args -c ${_header_filename} -o ${_pch_filename}) @@ -228,12 +226,10 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug") list(APPEND _args ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}) endif() list(APPEND _args ${GXX_WARNING_FLAGS}) - if (CYGWIN) - list(APPEND _args "-std=c++11 ") - list(APPEND _args "-U__STRICT_ANSI__") - else() - list(APPEND _args "-std=c++11 ") - endif() + list(APPEND _args "-std=c++11 ") + if (CYGWIN) + list(APPEND _args "-U__STRICT_ANSI__") + endif() list(APPEND _args "-x c++-header " ${_inc}) list(APPEND _args -c ${_header_filename} -o ${_gch_filename}) |