Github user phrocker commented on a diff in the pull request:
https://github.com/apache/nifi-minifi-cpp/pull/134#discussion_r137833409
--- Diff: CMakeLists.txt ---
@@ -35,6 +35,8 @@ ENDIF(POLICY CMP0048)
include(CheckCXXCompilerFlag)
CHECK_CXX_COMPILER_FLAG("-std=c++11 " COMPILER_SUPPORTS_CXX11)
CHECK_CXX_COMPILER_FLAG("-std=c++0x " COMPILER_SUPPORTS_CXX0X)
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ")
+SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
--- End diff --
Looking at the branch I had some optimizations and in the conflict removed
them. I'm going to think a little more about adding them back in and then make
a resolution of keeping these lines with the optimizations or remove the line
entirely, thanks!
---
