From 9b8c71562cacb12e69406a9712a1f5c2113852aa Mon Sep 17 00:00:00 2001 From: Vikram Rajkumar Date: Sat, 5 Jul 2014 19:42:14 -0400 Subject: [PATCH 1/2] Fix CMake warning --- vendor/easylzma/src/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vendor/easylzma/src/CMakeLists.txt b/vendor/easylzma/src/CMakeLists.txt index decbcc9..8772e6d 100644 --- a/vendor/easylzma/src/CMakeLists.txt +++ b/vendor/easylzma/src/CMakeLists.txt @@ -52,8 +52,8 @@ ENDIF (APPLE) ### copy the two required headers into our output dir as a post build step # copy public headers to output directory -FOREACH (header ${PUB_HDRS}) +#FOREACH (header ${PUB_HDRS}) # preserve relative pathing - ADD_CUSTOM_COMMAND(TARGET easylzma_s POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${header} ${incDir}) -ENDFOREACH (header ${PUB_HDRS}) + #ADD_CUSTOM_COMMAND(TARGET easylzma_s POST_BUILD + #COMMAND ${CMAKE_COMMAND} -E copy_if_different ${header} ${incDir}) + #ENDFOREACH (header ${PUB_HDRS}) From caae9e640f2ee488d003afef67f1db10f0049fca Mon Sep 17 00:00:00 2001 From: Vikram Rajkumar Date: Sat, 12 Jul 2014 17:29:19 -0400 Subject: [PATCH 2/2] Fix travis compilation error --- CMakeLists.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 78812b9..e3039e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -200,10 +200,9 @@ ELSE() SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall") 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() - target_compile_options(fc PUBLIC -std=c++11 -Wall -fnon-call-exceptions) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -fnon-call-exceptions") ENDIF() ENDIF()