Skip to content

Commit

Permalink
[fix][store] Fixup compile issues.
Browse files Browse the repository at this point in the history
  • Loading branch information
rock-git authored and ketor committed Jul 15, 2024
1 parent 4440dce commit 11850a3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,7 @@ set(DEPEND_LIBS
rapidjson
nlohmann-json
tantivy-search
ftxui
)

if(WITH_MKL)
Expand Down
10 changes: 6 additions & 4 deletions cmake/ftxui.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ SET(FTXUI_BINARY_DIR ${THIRD_PARTY_PATH}/build/ftxui)
SET(FTXUI_INSTALL_DIR ${THIRD_PARTY_PATH}/install/ftxui)
SET(FTXUI_INCLUDE_DIR "${FTXUI_INSTALL_DIR}/include" CACHE PATH "ftxui include directory." FORCE)

SET(FTXUI_COMPONENT_LIBRARY "${FTXUI_INSTALL_DIR}/lib64/libftxui-component.a" CACHE FILEPATH "ftxui library." FORCE)
SET(FTXUI_DOM_LIBRARY "${FTXUI_INSTALL_DIR}/lib64/libftxui-dom.a" CACHE FILEPATH "ftxui library." FORCE)
SET(FTXUI_SCREEN_LIBRARY "${FTXUI_INSTALL_DIR}/lib64/libftxui-screen.a" CACHE FILEPATH "ftxui library." FORCE)
SET(FTXUI_COMPONENT_LIBRARY "${FTXUI_INSTALL_DIR}/lib/libftxui-component.a" CACHE FILEPATH "ftxui library." FORCE)
SET(FTXUI_DOM_LIBRARY "${FTXUI_INSTALL_DIR}/lib/libftxui-dom.a" CACHE FILEPATH "ftxui library." FORCE)
SET(FTXUI_SCREEN_LIBRARY "${FTXUI_INSTALL_DIR}/lib/libftxui-screen.a" CACHE FILEPATH "ftxui library." FORCE)


ExternalProject_Add(
Expand All @@ -36,15 +36,17 @@ ExternalProject_Add(
CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
-DCMAKE_INSTALL_PREFIX=${FTXUI_INSTALL_DIR}
-DCMAKE_INSTALL_LIBDIR=${FTXUI_INSTALL_DIR}/lib
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
${EXTERNAL_OPTIONAL_ARGS}
LIST_SEPARATOR |
CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${FTXUI_INSTALL_DIR}
-DCMAKE_INSTALL_LIBDIR=${FTXUI_INSTALL_DIR}/lib
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
-DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE}
)

ADD_LIBRARY(ftxui STATIC IMPORTED GLOBAL)
# SET_PROPERTY(TARGET ftxui PROPERTY IMPORTED_LOCATION ${FTXUI_LIBRARIES})
SET_PROPERTY(TARGET ftxui PROPERTY IMPORTED_LOCATION ${FTXUI_COMPONENT_LIBRARY})
ADD_DEPENDENCIES(ftxui extern_ftxui)

0 comments on commit 11850a3

Please sign in to comment.