lordgamez commented on code in PR #1372:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1372#discussion_r923465027
##########
CMakeLists.txt:
##########
@@ -562,22 +562,22 @@ set(CPACK_COMPONENTS_GROUPING "ALL_COMPONENTS_IN_ONE")
list(APPEND CPACK_COMPONENTS_ALL bin)
cpack_add_component(bin DISPLAY_NAME "MiNiFi C++ executables" REQUIRED)
if(NOT WIN32)
- list(APPEND CPACK_COMPONENTS_ALL conf)
- cpack_add_component(conf DISPLAY_NAME "Default configuration files"
REQUIRED)
+ list(APPEND CPACK_COMPONENTS_ALL conf)
+ cpack_add_component(conf DISPLAY_NAME "Default configuration files"
REQUIRED)
endif()
cpack_add_component_group(extensions DISPLAY_NAME "Extensions" EXPANDED)
foreach(extension ${selected_extensions})
- get_component_name(${extension} component-name)
- list(APPEND CPACK_COMPONENTS_ALL ${component-name})
- cpack_add_component(${component-name} DISPLAY_NAME ${extension} GROUP
extensions DEPENDS bin)
+ get_component_name(${extension} component-name)
+ list(APPEND CPACK_COMPONENTS_ALL ${component-name})
+ cpack_add_component(${component-name} DISPLAY_NAME ${extension} GROUP
extensions DEPENDS bin)
endforeach()
include(CPack)
### include modules
if (NOT SKIP_TESTS)
- include(BuildTests)
+ include(BuildTests)
Review Comment:
Updated in c2d614d5bbed8233619efff96b56208bfccb48d4
##########
CMakeLists.txt:
##########
@@ -157,71 +157,71 @@ find_package(Patch REQUIRED)
# Setup passthrough args used by third parties
if (WIN32)
- set(PASSTHROUGH_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /w")
- set(PASSTHROUGH_CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /w")
+ set(PASSTHROUGH_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /w")
+ set(PASSTHROUGH_CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /w")
else()
- set(PASSTHROUGH_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
- set(PASSTHROUGH_CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
+ set(PASSTHROUGH_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
+ set(PASSTHROUGH_CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
endif()
set(PASSTHROUGH_CMAKE_ARGS -DANDROID_ABI=${ANDROID_ABI}
- -DANDROID_PLATFORM=${ANDROID_PLATFORM}
- -DANDROID_STL=${ANDROID_STL}
-
-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
- -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
- -DANDROID_NDK=${ANDROID_NDK}
-
-DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
- -DCMAKE_C_FLAGS=${PASSTHROUGH_CMAKE_C_FLAGS}
- -DCMAKE_CXX_FLAGS=${PASSTHROUGH_CMAKE_CXX_FLAGS}
- -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
- -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
- -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}
- -DCMAKE_SHARED_LINKER_FLAGS=${CMAKE_SHARED_LINKER_FLAGS}
- -DCMAKE_FIND_ROOT_PATH=${CMAKE_FIND_ROOT_PATH}
-
-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=${CMAKE_FIND_ROOT_PATH_MODE_PROGRAM}
-
-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=${CMAKE_FIND_ROOT_PATH_MODE_LIBRARY}
-
-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=${CMAKE_FIND_ROOT_PATH_MODE_INCLUDE}
- -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
- -DCOMPILE_DEFINITIONS=${COMPILE_DEFINITIONS}
- -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
- -DCMAKE_CXX_STANDARD_REQUIRED=${CMAKE_CXX_STANDARD_REQUIRED}
- -G${CMAKE_GENERATOR}
- )
+ -DANDROID_PLATFORM=${ANDROID_PLATFORM}
+ -DANDROID_STL=${ANDROID_STL}
+ -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+ -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+ -DANDROID_NDK=${ANDROID_NDK}
+ -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
+ -DCMAKE_C_FLAGS=${PASSTHROUGH_CMAKE_C_FLAGS}
+ -DCMAKE_CXX_FLAGS=${PASSTHROUGH_CMAKE_CXX_FLAGS}
+ -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+ -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+ -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}
+ -DCMAKE_SHARED_LINKER_FLAGS=${CMAKE_SHARED_LINKER_FLAGS}
+ -DCMAKE_FIND_ROOT_PATH=${CMAKE_FIND_ROOT_PATH}
+ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=${CMAKE_FIND_ROOT_PATH_MODE_PROGRAM}
+ -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=${CMAKE_FIND_ROOT_PATH_MODE_LIBRARY}
+ -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=${CMAKE_FIND_ROOT_PATH_MODE_INCLUDE}
+ -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
+ -DCOMPILE_DEFINITIONS=${COMPILE_DEFINITIONS}
+ -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
+ -DCMAKE_CXX_STANDARD_REQUIRED=${CMAKE_CXX_STANDARD_REQUIRED}
+ -G${CMAKE_GENERATOR}
+ )
# jemalloc
if(NOT WIN32)
- if (ENABLE_JNI)
- if (NOT DISABLE_JEMALLOC)
- include(BundledJemalloc)
- use_bundled_jemalloc(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR})
- message("jemalloc found at ${JEMALLOC_LIBRARIES}")
- endif()
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_JNI")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_JNI")
- endif()
+ if (ENABLE_JNI)
+ if (NOT DISABLE_JEMALLOC)
+ include(BundledJemalloc)
+ use_bundled_jemalloc(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR})
+ message("jemalloc found at ${JEMALLOC_LIBRARIES}")
+ endif()
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_JNI")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_JNI")
+ endif()
endif()
# Simple-Windows-Posix-Semaphore
if (WIN32)
- add_subdirectory("thirdparty/Simple-Windows-Posix-Semaphore")
+ add_subdirectory("thirdparty/Simple-Windows-Posix-Semaphore")
endif()
# ossp-uuid
if(NOT WIN32)
- include(BundledOSSPUUID)
- use_bundled_osspuuid(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR})
+ include(BundledOSSPUUID)
+ use_bundled_osspuuid(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR})
Review Comment:
Updated in c2d614d5bbed8233619efff96b56208bfccb48d4
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@nifi.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
