Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #36 from vikramrajkumar/master

Browse source 
compilation fixes
This commit is contained in:
Nikolai Mushegian 2014-07-12 18:04:13 -04:00
commit de3e2610a5
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -200,10 +200,9 @@ ELSE()
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall")
IF(APPLE) IF(APPLE)
SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -std=c++11 -stdlib=libc++ -Wall") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++ -Wall")
ELSE() ELSE()
target_compile_options(fc PUBLIC -std=c++11 -Wall -fnon-call-exceptions) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -fnon-call-exceptions")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
ENDIF() ENDIF()
ENDIF() ENDIF()

8
vendor/easylzma/src/CMakeLists.txt vendored
View file

@ -52,8 +52,8 @@ ENDIF (APPLE)
### copy the two required headers into our output dir as a post build step ### copy the two required headers into our output dir as a post build step
# copy public headers to output directory # copy public headers to output directory
FOREACH (header ${PUB_HDRS}) #FOREACH (header ${PUB_HDRS})
# preserve relative pathing # preserve relative pathing
ADD_CUSTOM_COMMAND(TARGET easylzma_s POST_BUILD #ADD_CUSTOM_COMMAND(TARGET easylzma_s POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${header} ${incDir}) #COMMAND ${CMAKE_COMMAND} -E copy_if_different ${header} ${incDir})
ENDFOREACH (header ${PUB_HDRS}) #ENDFOREACH (header ${PUB_HDRS})