You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@nifi.apache.org by GitBox <gi...@apache.org> on 2022/07/18 10:20:53 UTC

[GitHub] [nifi-minifi-cpp] lordgamez opened a new pull request, #1372: MINIFICPP-1884 Make whitespaces consistent across cmake files

lordgamez opened a new pull request, #1372:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1372

   Thank you for submitting a contribution to Apache NiFi - MiNiFi C++.
   
   In order to streamline the review of the contribution we ask you
   to ensure the following steps have been taken:
   
   ### For all changes:
   - [ ] Is there a JIRA ticket associated with this PR? Is it referenced
        in the commit message?
   
   - [ ] Does your PR title start with MINIFICPP-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
   
   - [ ] Has your PR been rebased against the latest commit within the target branch (typically main)?
   
   - [ ] Is your initial contribution a single, squashed commit?
   
   ### For code changes:
   - [ ] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)?
   - [ ] If applicable, have you updated the LICENSE file?
   - [ ] If applicable, have you updated the NOTICE file?
   
   ### For documentation related changes:
   - [ ] Have you ensured that format looks appropriate for the output in which it is rendered?
   
   ### Note:
   Please ensure that once the PR is submitted, you check GitHub Actions CI results for build issues and submit an update to your PR as soon as possible.
   


-- 
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-unsubscribe@nifi.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [nifi-minifi-cpp] fgerlits closed pull request #1372: MINIFICPP-1884 Make whitespaces consistent across cmake files

Posted by GitBox <gi...@apache.org>.
fgerlits closed pull request #1372: MINIFICPP-1884 Make whitespaces consistent across cmake files
URL: https://github.com/apache/nifi-minifi-cpp/pull/1372


-- 
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-unsubscribe@nifi.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [nifi-minifi-cpp] szaszm commented on a diff in pull request #1372: MINIFICPP-1884 Make whitespaces consistent across cmake files

Posted by GitBox <gi...@apache.org>.
szaszm commented on code in PR #1372:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1372#discussion_r923462069


##########
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:
   only 2 spaces here



-- 
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-unsubscribe@nifi.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [nifi-minifi-cpp] szaszm commented on a diff in pull request #1372: MINIFICPP-1884 Make whitespaces consistent across cmake files

Posted by GitBox <gi...@apache.org>.
szaszm commented on code in PR #1372:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1372#discussion_r923461126


##########
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:
   One extra space here



-- 
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-unsubscribe@nifi.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [nifi-minifi-cpp] lordgamez commented on a diff in pull request #1372: MINIFICPP-1884 Make whitespaces consistent across cmake files

Posted by GitBox <gi...@apache.org>.
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-unsubscribe@nifi.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [nifi-minifi-cpp] szaszm commented on a diff in pull request #1372: MINIFICPP-1884 Make whitespaces consistent across cmake files

Posted by GitBox <gi...@apache.org>.
szaszm commented on code in PR #1372:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1372#discussion_r923429288


##########
extensions/sftp/tests/CMakeLists.txt:
##########
@@ -24,41 +24,41 @@ find_package(Maven)
 message(STATUS "MAVEN: ${MAVEN_EXECUTABLE}")
 
 if (NOT SKIP_TESTS AND Java_FOUND AND Maven_FOUND AND NOT DISABLE_EXPRESSION_LANGUAGE)
-	file(GLOB SFTP_INTEGRATION_TESTS "*.cpp")
-	SET(SFTP-EXTENSIONS_TEST_COUNT 0)
-	FOREACH(testfile ${SFTP_INTEGRATION_TESTS})
-		get_filename_component(testfilename "${testfile}" NAME_WE)
-		add_executable("${testfilename}" "${testfile}")
-		target_include_directories(${testfilename} BEFORE PRIVATE ${LIBSSH2_INCLUDE_DIR})
-		target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
-		target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors/processors")
-		target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/test/")
-		target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/nanofi/include")
-		target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/sftp")
-		target_include_directories(${testfilename} BEFORE PRIVATE "../")
-		target_include_directories(${testfilename} BEFORE PRIVATE "../client/")
-		target_include_directories(${testfilename} BEFORE PRIVATE "../processors/")
-		target_include_directories(${testfilename} BEFORE PRIVATE ./include)
-		target_include_directories(${testfilename} BEFORE PRIVATE ./tools)
+    file(GLOB SFTP_INTEGRATION_TESTS "*.cpp")
+    SET(SFTP-EXTENSIONS_TEST_COUNT 0)
+    FOREACH(testfile ${SFTP_INTEGRATION_TESTS})
+        get_filename_component(testfilename "${testfile}" NAME_WE)
+        add_executable("${testfilename}" "${testfile}")
+        target_include_directories(${testfilename} BEFORE PRIVATE ${LIBSSH2_INCLUDE_DIR})
+        target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
+        target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors/processors")
+        target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/test/")
+        target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/nanofi/include")
+        target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/sftp")
+        target_include_directories(${testfilename} BEFORE PRIVATE "../")
+        target_include_directories(${testfilename} BEFORE PRIVATE "../client/")
+        target_include_directories(${testfilename} BEFORE PRIVATE "../processors/")
+        target_include_directories(${testfilename} BEFORE PRIVATE ./include)
+        target_include_directories(${testfilename} BEFORE PRIVATE ./tools)
 
-		createTests("${testfilename}")
-		target_link_libraries(${testfilename} ${CATCH_MAIN_LIB} core-minifi sftp-test-tools)
-		target_link_libraries(${testfilename} minifi-sftp)
-		target_link_libraries(${testfilename} minifi-expression-language-extensions)
-		target_link_libraries(${testfilename} minifi-standard-processors)
-		if (NOT DISABLE_ROCKSDB)
-			target_link_libraries(${testfilename} minifi-rocksdb-repos)
-		endif()
+        createTests("${testfilename}")
+        target_link_libraries(${testfilename} ${CATCH_MAIN_LIB} core-minifi sftp-test-tools)
+        target_link_libraries(${testfilename} minifi-sftp)
+        target_link_libraries(${testfilename} minifi-expression-language-extensions)
+        target_link_libraries(${testfilename} minifi-standard-processors)
+        if (NOT DISABLE_ROCKSDB)
+            target_link_libraries(${testfilename} minifi-rocksdb-repos)
+        endif()
 
-		MATH(EXPR SFTP-EXTENSIONS_TEST_COUNT "${SFTP-EXTENSIONS_TEST_COUNT}+1")
-		add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
-	ENDFOREACH()
-	message("-- Finished building ${SFTP-EXTENSIONS_TEST_COUNT} SFTP related test file(s)...")
+        MATH(EXPR SFTP-EXTENSIONS_TEST_COUNT "${SFTP-EXTENSIONS_TEST_COUNT}+1")
+        add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
+    ENDFOREACH()
+    message("-- Finished building ${SFTP-EXTENSIONS_TEST_COUNT} SFTP related test file(s)...")
 
-	# Copy test resources
-	file(COPY "${CMAKE_SOURCE_DIR}/extensions/sftp/tests/resources" DESTINATION "${CMAKE_BINARY_DIR}/bin/sftp-test/")
+    # Copy test resources
+    file(COPY "${CMAKE_SOURCE_DIR}/extensions/sftp/tests/resources" DESTINATION "${CMAKE_BINARY_DIR}/bin/sftp-test/")
 
-	add_subdirectory(tools)
+    add_subdirectory(tools)
 else()
-	message("Could find Java and Maven to build SFTPTestServer, disabling SFTP tests")
+  message("Could find Java and Maven to build SFTPTestServer, disabling SFTP tests")

Review Comment:
   This one is two spaces instead of 4



-- 
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-unsubscribe@nifi.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [nifi-minifi-cpp] szaszm commented on a diff in pull request #1372: MINIFICPP-1884 Make whitespaces consistent across cmake files

Posted by GitBox <gi...@apache.org>.
szaszm commented on code in PR #1372:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1372#discussion_r923313715


##########
CMakeLists.txt:
##########
@@ -68,8 +68,8 @@ option(USE_REAL_ODBC_TEST_DRIVER "Use SQLite ODBC driver in SQL extenstion unit
 # different than "GNU Makefiles".
 option (FORCE_COLORED_OUTPUT "Always produce ANSI-colored output (GNU/Clang only)." FALSE)
 option(AWS_ENABLE_UNITY_BUILD "If enabled, AWS SDK libraries will be built as a single, generated .cpp file. \
-	This can significantly reduce static library size as well as speed up a single compilation time, but it is regenerated \
-	and recompiled in every iterative build instance. Turn off to avoid recompilation." ON)
+  This can significantly reduce static library size as well as speed up a single compilation time, but it is regenerated \
+  and recompiled in every iterative build instance. Turn off to avoid recompilation." ON)

Review Comment:
   Continuations should be indented with two extra levels of indentation.



##########
cmake/BundledRocksDB.cmake:
##########
@@ -42,9 +42,9 @@ function(use_bundled_rocksdb SOURCE_DIR BINARY_DIR)
     if(PORTABLE)
         list(APPEND ROCKSDB_CMAKE_ARGS -DPORTABLE=ON)
     endif()
-	if(WIN32)
-		list(APPEND ROCKSDB_CMAKE_ARGS -DROCKSDB_INSTALL_ON_WINDOWS=ON)
-	endif()
+  if(WIN32)

Review Comment:
   This is messed up, too. I'm assuming your tool only replaced tabs with 2 spaces, but not existing 4 space indentation with 2 spaces.



##########
cmake/BundledLibArchive.cmake:
##########
@@ -116,5 +116,5 @@ function(use_bundled_libarchive SOURCE_DIR BINARY_DIR)
     endif()
     file(MAKE_DIRECTORY ${LIBARCHIVE_INCLUDE_DIRS})
     set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${LIBARCHIVE_INCLUDE_DIRS})
-	set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS "LIBARCHIVE_STATIC=1")
+  set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS "LIBARCHIVE_STATIC=1")

Review Comment:
   This looks messed up



-- 
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-unsubscribe@nifi.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [nifi-minifi-cpp] szaszm commented on a diff in pull request #1372: MINIFICPP-1884 Make whitespaces consistent across cmake files

Posted by GitBox <gi...@apache.org>.
szaszm commented on code in PR #1372:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1372#discussion_r923360961


##########
CMakeLists.txt:
##########
@@ -68,8 +68,8 @@ option(USE_REAL_ODBC_TEST_DRIVER "Use SQLite ODBC driver in SQL extenstion unit
 # different than "GNU Makefiles".
 option (FORCE_COLORED_OUTPUT "Always produce ANSI-colored output (GNU/Clang only)." FALSE)
 option(AWS_ENABLE_UNITY_BUILD "If enabled, AWS SDK libraries will be built as a single, generated .cpp file. \
-	This can significantly reduce static library size as well as speed up a single compilation time, but it is regenerated \
-	and recompiled in every iterative build instance. Turn off to avoid recompilation." ON)
+  This can significantly reduce static library size as well as speed up a single compilation time, but it is regenerated \
+  and recompiled in every iterative build instance. Turn off to avoid recompilation." ON)

Review Comment:
   I think so, yes, but subjectively 4 spaces continuation in a 4 space indentation environment is not bothering my eyes as much as 2 spaces continuation, so I didn't really care.



-- 
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-unsubscribe@nifi.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [nifi-minifi-cpp] lordgamez commented on a diff in pull request #1372: MINIFICPP-1884 Make whitespaces consistent across cmake files

Posted by GitBox <gi...@apache.org>.
lordgamez commented on code in PR #1372:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1372#discussion_r923464903


##########
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 f5fca2273376524f4566f9a5044d419f3e7fa5b3



##########
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 f5fca2273376524f4566f9a5044d419f3e7fa5b3



-- 
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-unsubscribe@nifi.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [nifi-minifi-cpp] lordgamez commented on a diff in pull request #1372: MINIFICPP-1884 Make whitespaces consistent across cmake files

Posted by GitBox <gi...@apache.org>.
lordgamez commented on code in PR #1372:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1372#discussion_r923434339


##########
extensions/sftp/tests/CMakeLists.txt:
##########
@@ -24,41 +24,41 @@ find_package(Maven)
 message(STATUS "MAVEN: ${MAVEN_EXECUTABLE}")
 
 if (NOT SKIP_TESTS AND Java_FOUND AND Maven_FOUND AND NOT DISABLE_EXPRESSION_LANGUAGE)
-	file(GLOB SFTP_INTEGRATION_TESTS "*.cpp")
-	SET(SFTP-EXTENSIONS_TEST_COUNT 0)
-	FOREACH(testfile ${SFTP_INTEGRATION_TESTS})
-		get_filename_component(testfilename "${testfile}" NAME_WE)
-		add_executable("${testfilename}" "${testfile}")
-		target_include_directories(${testfilename} BEFORE PRIVATE ${LIBSSH2_INCLUDE_DIR})
-		target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
-		target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors/processors")
-		target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/test/")
-		target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/nanofi/include")
-		target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/sftp")
-		target_include_directories(${testfilename} BEFORE PRIVATE "../")
-		target_include_directories(${testfilename} BEFORE PRIVATE "../client/")
-		target_include_directories(${testfilename} BEFORE PRIVATE "../processors/")
-		target_include_directories(${testfilename} BEFORE PRIVATE ./include)
-		target_include_directories(${testfilename} BEFORE PRIVATE ./tools)
+    file(GLOB SFTP_INTEGRATION_TESTS "*.cpp")
+    SET(SFTP-EXTENSIONS_TEST_COUNT 0)
+    FOREACH(testfile ${SFTP_INTEGRATION_TESTS})
+        get_filename_component(testfilename "${testfile}" NAME_WE)
+        add_executable("${testfilename}" "${testfile}")
+        target_include_directories(${testfilename} BEFORE PRIVATE ${LIBSSH2_INCLUDE_DIR})
+        target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors")
+        target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/standard-processors/processors")
+        target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/libminifi/test/")
+        target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/nanofi/include")
+        target_include_directories(${testfilename} BEFORE PRIVATE "${CMAKE_SOURCE_DIR}/extensions/sftp")
+        target_include_directories(${testfilename} BEFORE PRIVATE "../")
+        target_include_directories(${testfilename} BEFORE PRIVATE "../client/")
+        target_include_directories(${testfilename} BEFORE PRIVATE "../processors/")
+        target_include_directories(${testfilename} BEFORE PRIVATE ./include)
+        target_include_directories(${testfilename} BEFORE PRIVATE ./tools)
 
-		createTests("${testfilename}")
-		target_link_libraries(${testfilename} ${CATCH_MAIN_LIB} core-minifi sftp-test-tools)
-		target_link_libraries(${testfilename} minifi-sftp)
-		target_link_libraries(${testfilename} minifi-expression-language-extensions)
-		target_link_libraries(${testfilename} minifi-standard-processors)
-		if (NOT DISABLE_ROCKSDB)
-			target_link_libraries(${testfilename} minifi-rocksdb-repos)
-		endif()
+        createTests("${testfilename}")
+        target_link_libraries(${testfilename} ${CATCH_MAIN_LIB} core-minifi sftp-test-tools)
+        target_link_libraries(${testfilename} minifi-sftp)
+        target_link_libraries(${testfilename} minifi-expression-language-extensions)
+        target_link_libraries(${testfilename} minifi-standard-processors)
+        if (NOT DISABLE_ROCKSDB)
+            target_link_libraries(${testfilename} minifi-rocksdb-repos)
+        endif()
 
-		MATH(EXPR SFTP-EXTENSIONS_TEST_COUNT "${SFTP-EXTENSIONS_TEST_COUNT}+1")
-		add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
-	ENDFOREACH()
-	message("-- Finished building ${SFTP-EXTENSIONS_TEST_COUNT} SFTP related test file(s)...")
+        MATH(EXPR SFTP-EXTENSIONS_TEST_COUNT "${SFTP-EXTENSIONS_TEST_COUNT}+1")
+        add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR})
+    ENDFOREACH()
+    message("-- Finished building ${SFTP-EXTENSIONS_TEST_COUNT} SFTP related test file(s)...")
 
-	# Copy test resources
-	file(COPY "${CMAKE_SOURCE_DIR}/extensions/sftp/tests/resources" DESTINATION "${CMAKE_BINARY_DIR}/bin/sftp-test/")
+    # Copy test resources
+    file(COPY "${CMAKE_SOURCE_DIR}/extensions/sftp/tests/resources" DESTINATION "${CMAKE_BINARY_DIR}/bin/sftp-test/")
 
-	add_subdirectory(tools)
+    add_subdirectory(tools)
 else()
-	message("Could find Java and Maven to build SFTPTestServer, disabling SFTP tests")
+  message("Could find Java and Maven to build SFTPTestServer, disabling SFTP tests")

Review Comment:
   Good catch, updated in 8a018d648c9137712e6cff0de9b2c9beb0d9e298



-- 
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-unsubscribe@nifi.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [nifi-minifi-cpp] lordgamez commented on a diff in pull request #1372: MINIFICPP-1884 Make whitespaces consistent across cmake files

Posted by GitBox <gi...@apache.org>.
lordgamez commented on code in PR #1372:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1372#discussion_r923326495


##########
CMakeLists.txt:
##########
@@ -68,8 +68,8 @@ option(USE_REAL_ODBC_TEST_DRIVER "Use SQLite ODBC driver in SQL extenstion unit
 # different than "GNU Makefiles".
 option (FORCE_COLORED_OUTPUT "Always produce ANSI-colored output (GNU/Clang only)." FALSE)
 option(AWS_ENABLE_UNITY_BUILD "If enabled, AWS SDK libraries will be built as a single, generated .cpp file. \
-	This can significantly reduce static library size as well as speed up a single compilation time, but it is regenerated \
-	and recompiled in every iterative build instance. Turn off to avoid recompilation." ON)
+  This can significantly reduce static library size as well as speed up a single compilation time, but it is regenerated \
+  and recompiled in every iterative build instance. Turn off to avoid recompilation." ON)

Review Comment:
   I was not aware of this, should this be the same for parameters as well? Like in cmake/BundledOpenCV.cmake `set` parameters are wrapped differently with either 1 or 2 indentations in new lines.



-- 
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-unsubscribe@nifi.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org