diff options
| author | Hans Erik van Elburg <hanserik@vanelburg.net> | 2015-01-03 23:35:39 +0100 |
|---|---|---|
| committer | Hans Erik van Elburg <hanserik@vanelburg.net> | 2015-01-03 23:35:39 +0100 |
| commit | 93c55c5ec6db6bce3173204f6a62ab5b2b8afde1 (patch) | |
| tree | 11184f4c379b30ab98d60338b698db3a0813626b | |
| parent | 617be983b9d9afd67dd1752f3331f02a4450361e (diff) | |
| download | fork-ledger-93c55c5ec6db6bce3173204f6a62ab5b2b8afde1.tar.gz fork-ledger-93c55c5ec6db6bce3173204f6a62ab5b2b8afde1.tar.bz2 fork-ledger-93c55c5ec6db6bce3173204f6a62ab5b2b8afde1.zip | |
also added cygwin tweak to src/CMakeLists.txt
| -rwxr-xr-x | acprep | 8 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 14 |
2 files changed, 19 insertions, 3 deletions
@@ -685,7 +685,10 @@ class PrepareBuild(CommandLineApp): if self.options.python: self.configure_args.append('-DUSE_PYTHON=1') - if self.options.use_ninja: + if system.startswith('CYGWIN'): + self.configure_args.append('-G') + self.configure_args.append('Unix Makefiles') + elif self.options.use_ninja: self.configure_args.append('-GNinja') if exists('/Users/johnw/Projects/ledger/plan/TODO'): @@ -819,6 +822,9 @@ class PrepareBuild(CommandLineApp): if self.prefix_directory(): conf_args.append('-DCMAKE_INSTALL_PREFIX=%s' % self.prefix_directory()) + if self.is_cygwin: + + return (environ, conf_args + self.configure_args) def phase_configure(self, *args): diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index aec75c06..dcafeba2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -167,7 +167,12 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug") if (BUILD_LIBRARY) list(APPEND _args ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}) endif() - list(APPEND _args "-std=c++11 ") + 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 "-x c++-header " ${_inc}) list(APPEND _args -c ${_header_filename} -o ${_pch_filename}) @@ -223,7 +228,12 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug") list(APPEND _args ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}) endif() list(APPEND _args ${GXX_WARNING_FLAGS}) - list(APPEND _args "-std=c++11 ") + 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 "-x c++-header " ${_inc}) list(APPEND _args -c ${_header_filename} -o ${_gch_filename}) |