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

Merge pull request #362 from lowdef/cleanup_after_pulreq360and361

Browse source 
cygwin build: cleanup after overlapping pull requests 360 & 361 + make changes minimalistic
This commit is contained in:
John Wiegley 2015-01-04 11:12:54 -06:00
commit e2631ca36c
2 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CMakeLists.txt
View file

@ -13,12 +13,7 @@ set(Ledger_VERSION_DATE 20141005)
enable_testing() enable_testing()
if (CYGWIN) add_definitions(-std=c++11)
add_definitions(-std=c++11 -U__STRICT_ANSI__)
else()
add_definitions(-std=c++11)
endif()
if (CYGWIN) if (CYGWIN)
add_definitions(-U__STRICT_ANSI__) add_definitions(-U__STRICT_ANSI__)
endif() endif()

20
src/CMakeLists.txt
View file

@ -167,12 +167,10 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
if (BUILD_LIBRARY) if (BUILD_LIBRARY)
list(APPEND _args ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}) list(APPEND _args ${CMAKE_SHARED_LIBRARY_CXX_FLAGS})
endif() endif()
if (CYGWIN) list(APPEND _args "-std=c++11 ")
list(APPEND _args "-std=c++11 ") if (CYGWIN)
list(APPEND _args "-U__STRICT_ANSI__") list(APPEND _args "-U__STRICT_ANSI__")
else() endif()
list(APPEND _args "-std=c++11 ")
endif()
list(APPEND _args "-x c++-header " ${_inc}) list(APPEND _args "-x c++-header " ${_inc})
list(APPEND _args -c ${_header_filename} -o ${_pch_filename}) 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}) list(APPEND _args ${CMAKE_SHARED_LIBRARY_CXX_FLAGS})
endif() endif()
list(APPEND _args ${GXX_WARNING_FLAGS}) list(APPEND _args ${GXX_WARNING_FLAGS})
if (CYGWIN) list(APPEND _args "-std=c++11 ")
list(APPEND _args "-std=c++11 ") if (CYGWIN)
list(APPEND _args "-U__STRICT_ANSI__") list(APPEND _args "-U__STRICT_ANSI__")
else() endif()
list(APPEND _args "-std=c++11 ")
endif()
list(APPEND _args "-x c++-header " ${_inc}) list(APPEND _args "-x c++-header " ${_inc})
list(APPEND _args -c ${_header_filename} -o ${_gch_filename}) list(APPEND _args -c ${_header_filename} -o ${_gch_filename})