sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

also added cygwin tweak to src/CMakeLists.txt

Browse source
This commit is contained in:
Hans Erik van Elburg 2015-01-03 23:35:39 +01:00
parent 617be983b9
commit 93c55c5ec6
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
acprep
View file

@ -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):

14
src/CMakeLists.txt
View file

@ -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})