hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix make DESTDIR=./ install problem

Browse Source
This commit is contained in:
wenxingsen
2022-11-22 02:37:54 +00:00
committed by wangzelin.wzl
parent 0eef672f1a
commit 039917f979
3 changed files with 49 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@ -118,6 +118,24 @@ cmake_dependent_option(
"NOT OB_BUILD_RPM" OFF) "NOT OB_BUILD_RPM" OFF)
option(OB_BUILD_TEST "" OFF) option(OB_BUILD_TEST "" OFF)
# OB_BUILD_RPM => build sql proxy parser
cmake_dependent_option(
OB_BUILD_LIBOB_SQL_PROXY_PARSER "Build lib_sql_proxy_parser" OFF
"NOT OB_BUILD_RPM" ON
)
# OB_BUILD_RPM => build OB_BUILD_LIBOBTABLE
cmake_dependent_option(
OB_BUILD_LIBOBTABLE "Build liboblog" OFF
"NOT OB_BUILD_RPM" ON
)
# OB_BUILD_RPM => build OB_BUILD_OBADMIN
cmake_dependent_option(
OB_BUILD_OBADMIN "Build ob_admin" OFF
"NOT OB_BUILD_RPM" ON
)
include(CTest) include(CTest)
if (OB_BUILD_UNITTEST) if (OB_BUILD_UNITTEST)
add_subdirectory(unittest) add_subdirectory(unittest)

2
build.sh
View File

@ -198,7 +198,7 @@ function build
;; ;;
xrpm) xrpm)
STATIC_LINK_LGPL_DEPS_OPTION=OFF STATIC_LINK_LGPL_DEPS_OPTION=OFF
do_build "$@" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOB_USE_LLD=$LLD_OPTION -DENABLE_FATAL_ERROR_HANG=OFF -DENABLE_AUTO_FDO=ON -DOB_STATIC_LINK_LGPL_DEPS=$STATIC_LINK_LGPL_DEPS_OPTION do_build "$@" -DOB_BUILD_RPM=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOB_USE_LLD=$LLD_OPTION -DENABLE_FATAL_ERROR_HANG=OFF -DENABLE_AUTO_FDO=ON -DOB_STATIC_LINK_LGPL_DEPS=$STATIC_LINK_LGPL_DEPS_OPTION
;; ;;
xenable_smart_var_check) xenable_smart_var_check)
do_build "$@" -DCMAKE_BUILD_TYPE=Debug -DOB_USE_LLD=$LLD_OPTION -DENABLE_SMART_VAR_CHECK=ON -DOB_ENABLE_AVX2=ON do_build "$@" -DCMAKE_BUILD_TYPE=Debug -DOB_USE_LLD=$LLD_OPTION -DENABLE_SMART_VAR_CHECK=ON -DOB_ENABLE_AVX2=ON

33
cmake/RPM.cmake
View File

@ -75,7 +75,7 @@ install(
COMPONENT server) COMPONENT server)
## oceanbase-cdc ## oceanbase-cdc
if (NOT OB_SO_CACHE) if (NOT OB_SO_CACHE AND OB_BUILD_CDC)
include(GNUInstallDirs) include(GNUInstallDirs)
install( install(
TARGETS obcdc obcdc_tailf TARGETS obcdc obcdc_tailf
@ -103,11 +103,13 @@ install(
endif() endif()
## oceanbase-sql-parser ## oceanbase-sql-parser
install(PROGRAMS if (OB_BUILD_LIBOB_SQL_PROXY_PARSER)
install(PROGRAMS
${CMAKE_BINARY_DIR}/src/sql/parser/libob_sql_proxy_parser_static.a ${CMAKE_BINARY_DIR}/src/sql/parser/libob_sql_proxy_parser_static.a
DESTINATION lib DESTINATION lib
COMPONENT sql-parser COMPONENT sql-parser
) )
endif()
install(FILES install(FILES
src/objit/include/objit/common/ob_item_type.h src/objit/include/objit/common/ob_item_type.h
@ -119,13 +121,6 @@ install(FILES
DESTINATION include DESTINATION include
COMPONENT sql-parser) COMPONENT sql-parser)
## oceanbase-sql-parser
install(PROGRAMS
${CMAKE_BINARY_DIR}/src/sql/parser/libob_sql_proxy_parser_static.a
DESTINATION lib
COMPONENT sql-parser
)
install(FILES install(FILES
src/objit/include/objit/common/ob_item_type.h src/objit/include/objit/common/ob_item_type.h
deps/oblib/src/common/sql_mode/ob_sql_mode.h deps/oblib/src/common/sql_mode/ob_sql_mode.h
@ -296,20 +291,22 @@ install(FILES
COMPONENT table) COMPONENT table)
install(FILES install(FILES
src/libtable//examples/ob_pstore_example.cpp src/libtable/examples/ob_pstore_example.cpp
src/libtable//examples/ob_kvtable_example.cpp src/libtable/examples/ob_kvtable_example.cpp
src/libtable//examples/ob_table_example.cpp src/libtable/examples/ob_table_example.cpp
src/libtable//examples/example_makefile.mk src/libtable/examples/example_makefile.mk
DESTINATION examples DESTINATION examples
COMPONENT table) COMPONENT table)
install(PROGRAMS if (OB_BUILD_LIBOBTABLE)
install(PROGRAMS
${CMAKE_BINARY_DIR}/src/libtable/src/libobtable.so ${CMAKE_BINARY_DIR}/src/libtable/src/libobtable.so
${CMAKE_BINARY_DIR}/src/libtable/src/libobtable.so.1 ${CMAKE_BINARY_DIR}/src/libtable/src/libobtable.so.1
${CMAKE_BINARY_DIR}/src/libtable/src/libobtable.so.1.0.0 ${CMAKE_BINARY_DIR}/src/libtable/src/libobtable.so.1.0.0
${CMAKE_BINARY_DIR}/src/libtable/src/libobtable_static.a ${CMAKE_BINARY_DIR}/src/libtable/src/libobtable_static.a
DESTINATION lib DESTINATION lib
COMPONENT table) COMPONENT table)
endif()
## oceanbase-libs ## oceanbase-libs
install(PROGRAMS install(PROGRAMS
@ -321,13 +318,15 @@ install(PROGRAMS
DESTINATION lib DESTINATION lib
COMPONENT libs COMPONENT libs
) )
## oceanbase-utils if(OB_BUILD_OBMAIN)
install(PROGRAMS ## oceanbase-utils
install(PROGRAMS
${CMAKE_BINARY_DIR}/tools/ob_admin/ob_admin ${CMAKE_BINARY_DIR}/tools/ob_admin/ob_admin
${CMAKE_BINARY_DIR}/tools/ob_error/src/ob_error ${CMAKE_BINARY_DIR}/tools/ob_error/src/ob_error
DESTINATION /usr/bin DESTINATION /usr/bin
COMPONENT utils COMPONENT utils
) )
endif()
# install cpack to make everything work # install cpack to make everything work
include(CPack) include(CPack)