From 90869c087fa0545987dfd3224af9fefad8ab8c5f Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Tue, 18 Jun 2019 11:13:13 +0200 Subject: [PATCH] fix snowball invocation and dependencies (#9275) --- 3rdParty/iresearch/external/snowball/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/3rdParty/iresearch/external/snowball/CMakeLists.txt b/3rdParty/iresearch/external/snowball/CMakeLists.txt index d93a172b8c..cc43fdf2cf 100644 --- a/3rdParty/iresearch/external/snowball/CMakeLists.txt +++ b/3rdParty/iresearch/external/snowball/CMakeLists.txt @@ -169,6 +169,8 @@ SET(COMPILER_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/compiler/generator_rust.c ) +ADD_EXECUTABLE(snowball ${COMPILER_SOURCES}) + SET(SNOWBALL_RUNTIME ${CMAKE_CURRENT_SOURCE_DIR}/runtime/api.c ${CMAKE_CURRENT_SOURCE_DIR}/runtime/utilities.c @@ -192,14 +194,14 @@ MACRO(gen_stem IN ENCODING) SET(_input "${CMAKE_CURRENT_SOURCE_DIR}/algorithms/${_it}/stem_${_in_enc}.sbl") IF(${_in_enc} STREQUAL "Unicode" AND NOT EXISTS ${_input}) ADD_CUSTOM_COMMAND(OUTPUT ${_source} - COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/snowball "${CMAKE_CURRENT_SOURCE_DIR}/algorithms/${_it}/stem_ISO_8859_1.sbl" -o ${_base} -eprefix ${_it}_${ENCODING}_ -r ${CMAKE_CURRENT_SOURCE_DIR}/runtime -u + COMMAND $ "${CMAKE_CURRENT_SOURCE_DIR}/algorithms/${_it}/stem_ISO_8859_1.sbl" -o ${_base} -eprefix ${_it}_${ENCODING}_ -r ${CMAKE_CURRENT_SOURCE_DIR}/runtime -u DEPENDS snowball) LIST(APPEND STEMMER_SOURCES ${_source}) ELSE() IF(EXISTS "${_input}") ADD_CUSTOM_COMMAND(OUTPUT ${_source} - COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/snowball ${_input} -o ${_base} -eprefix ${_it}_${ENCODING}_ -r ${CMAKE_CURRENT_SOURCE_DIR}/runtime -u + COMMAND $ ${_input} -o ${_base} -eprefix ${_it}_${ENCODING}_ -r ${CMAKE_CURRENT_SOURCE_DIR}/runtime -u DEPENDS snowball) LIST(APPEND STEMMER_SOURCES ${_source}) ENDIF() @@ -210,8 +212,6 @@ ENDMACRO() INCLUDE_DIRECTORIES("include") INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/libstemmer") -ADD_EXECUTABLE(snowball ${COMPILER_SOURCES}) - ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libstemmer/modules.h COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/libstemmer COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/libstemmer/mkmodules.pl ${CMAKE_CURRENT_BINARY_DIR}/libstemmer/modules.h "libstemmer" ${CMAKE_CURRENT_SOURCE_DIR}/libstemmer/modules.txt ${CMAKE_CURRENT_BINARY_DIR}/libstemmer/mkinc.mak