szaszm commented on code in PR #2047:
URL: https://github.com/apache/nifi-minifi-cpp/pull/2047#discussion_r2429681335
##########
extensions/expression-language/CMakeLists.txt:
##########
@@ -112,37 +104,10 @@ file(MAKE_DIRECTORY ${EL_GENERATED_INCLUDE_DIR})
add_flex_bison_dependency(el-scanner el-parser)
-include_directories(./ ../../libminifi/include ../../libminifi/include/core)
-include_directories(SYSTEM ../../thirdparty/)
-include_directories(common)
-include_directories(impl)
-
-if(WIN32)
- include_directories(../../libminifi/opsys/win)
- set(SOCKET_SOURCES "src/io/win/*.cpp")
-else()
- include_directories(../../libminifi/opsys/posix)
- set(SOCKET_SOURCES "src/io/posix/*.cpp")
-endif()
-
-
-file(GLOB SOURCES "*.cpp")
-
if (NOT WIN32)
set_source_files_properties(${BISON_el-parser_OUTPUTS} PROPERTIES
COMPILE_FLAGS -Wno-error)
set_source_files_properties(${FLEX_el-scanner_OUTPUTS} PROPERTIES
COMPILE_FLAGS -Wno-error)
else()
set_source_files_properties(${BISON_el-parser_OUTPUTS} PROPERTIES
COMPILE_FLAGS /wd4244)
set_source_files_properties(${FLEX_el-scanner_OUTPUTS} PROPERTIES
COMPILE_FLAGS /wd4244)
endif()
-
-add_minifi_library(minifi-expression-language-extensions SHARED ${SOURCES}
${BISON_el-parser_OUTPUTS} ${FLEX_el-scanner_OUTPUTS})
-
-target_include_directories(minifi-expression-language-extensions SYSTEM
PRIVATE ${EL_GENERATED_INCLUDE_DIR})
-target_link_libraries(minifi-expression-language-extensions ${LIBMINIFI})
-target_link_libraries(minifi-expression-language-extensions RapidJSON)
-if (BREW_FLEX_INCLUDE)
- target_include_directories(minifi-expression-language-extensions SYSTEM
PRIVATE ${BREW_FLEX_INCLUDE})
-endif()
Review Comment:
is this no longer needed?
##########
bootstrap/system_dependency.py:
##########
@@ -24,10 +24,6 @@
def _create_system_dependencies(minifi_options: MinifiOptions) -> Dict[str,
Set[str]]:
system_dependencies = {'patch': {'patch'}, 'make': {'make'}, 'perl':
{'perl'}, 'git': {'git'}}
- if minifi_options.is_enabled("ENABLE_EXPRESSION_LANGUAGE"):
- system_dependencies['bison'] = {'bison'}
- system_dependencies['flex'] = {'flex'}
- system_dependencies['m4'] = {'m4'}
Review Comment:
these dependencies didn't just disappear, they just became unconditional.
Instead of removing them, they should be moved to the general list one line
above.
##########
extensions/expression-language/CMakeLists.txt:
##########
@@ -112,37 +104,10 @@ file(MAKE_DIRECTORY ${EL_GENERATED_INCLUDE_DIR})
add_flex_bison_dependency(el-scanner el-parser)
-include_directories(./ ../../libminifi/include ../../libminifi/include/core)
-include_directories(SYSTEM ../../thirdparty/)
-include_directories(common)
-include_directories(impl)
-
-if(WIN32)
- include_directories(../../libminifi/opsys/win)
- set(SOCKET_SOURCES "src/io/win/*.cpp")
-else()
- include_directories(../../libminifi/opsys/posix)
- set(SOCKET_SOURCES "src/io/posix/*.cpp")
-endif()
-
-
-file(GLOB SOURCES "*.cpp")
-
if (NOT WIN32)
set_source_files_properties(${BISON_el-parser_OUTPUTS} PROPERTIES
COMPILE_FLAGS -Wno-error)
set_source_files_properties(${FLEX_el-scanner_OUTPUTS} PROPERTIES
COMPILE_FLAGS -Wno-error)
else()
set_source_files_properties(${BISON_el-parser_OUTPUTS} PROPERTIES
COMPILE_FLAGS /wd4244)
set_source_files_properties(${FLEX_el-scanner_OUTPUTS} PROPERTIES
COMPILE_FLAGS /wd4244)
endif()
-
-add_minifi_library(minifi-expression-language-extensions SHARED ${SOURCES}
${BISON_el-parser_OUTPUTS} ${FLEX_el-scanner_OUTPUTS})
-
-target_include_directories(minifi-expression-language-extensions SYSTEM
PRIVATE ${EL_GENERATED_INCLUDE_DIR})
-target_link_libraries(minifi-expression-language-extensions ${LIBMINIFI})
-target_link_libraries(minifi-expression-language-extensions RapidJSON)
-if (BREW_FLEX_INCLUDE)
- target_include_directories(minifi-expression-language-extensions SYSTEM
PRIVATE ${BREW_FLEX_INCLUDE})
-endif()
Review Comment:
is this no longer needed?
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
