Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CBRD-24453] Check the CCI driver file related to engine build. #52

Merged
merged 1 commit into from
Aug 16, 2022
Merged

[CBRD-24453] Check the CCI driver file related to engine build. #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,14 @@ cmake_minimum_required(VERSION 2.8)

if(WITH_CCI)
message(STATUS "======== WITH_CCI ==========")

set(CCI_BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/base)
set(CCI_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/cci)
set(CCI_TOOLS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/tools)

add_subdirectory(cci)
add_subdirectory(tools)

else(WITH_CCI)
message(STATUS "======== CCI REPO MAKE ==========")
#also searches for modules onto cubrid/cmake
Expand Down Expand Up @@ -174,9 +180,9 @@ endif()
message(STATUS "Build ${PROJECT_NAME} ${CUBRID_VERSION} ${TARGET_PLATFORM_BITS}bit ${CMAKE_BUILD_TYPE} on ${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_PROCESSOR}")

# source directories
set(BASE_DIR ${CMAKE_SOURCE_DIR}/src/base)
set(CCI_BASE_DIR ${CMAKE_SOURCE_DIR}/src/base)
set(CCI_DIR ${CMAKE_SOURCE_DIR}/src/cci)
set(TOOLS_DIR ${CMAKE_SOURCE_DIR}/src/tools)
set(CCI_TOOLS_DIR ${CMAKE_SOURCE_DIR}/src/tools)

include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(
Expand Down
6 changes: 3 additions & 3 deletions cci/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#

set(CASCCI_SOURCES
${BASE_DIR}/porting.c
${CCI_BASE_DIR}/porting.c
${CCI_DIR}/cas_cci.c
${CCI_DIR}/cci_util.c
${CCI_DIR}/cci_query_execute.c
Expand All @@ -34,7 +34,7 @@ set(CASCCI_SOURCES
)
if(WIN32)
list(APPEND CASCCI_SOURCES ${CCI_DIR}/cci_wsa_init.c)
list(APPEND CASCCI_SOURCES ${BASE_DIR}/rand.c)
list(APPEND CASCCI_SOURCES ${CCI_BASE_DIR}/rand.c)
endif(WIN32)

SET_SOURCE_FILES_PROPERTIES(
Expand Down Expand Up @@ -196,7 +196,7 @@ if(WIN32)
else(FOR_OTHER_DRIVER)
target_compile_definitions(cascci PRIVATE CAS_CCI_DL)
endif(FOR_OTHER_DRIVER)
set_target_properties(cascci PROPERTIES LINK_FLAGS "/DEF:\"${CMAKE_SOURCE_DIR}/win/cascci/cascci.def\"" LINK_FLAGS_RELEASE "/NODEFAULTLIB:libcmt.lib" LINK_FLAGS_DEBUG "/NODEFAULTLIB:msvcrt.lib")
set_target_properties(cascci PROPERTIES LINK_FLAGS "/DEF:\"${CCI_ROOT_PATH}/win/cascci/cascci.def\"" LINK_FLAGS_RELEASE "/NODEFAULTLIB:libcmt.lib" LINK_FLAGS_DEBUG "/NODEFAULTLIB:msvcrt.lib")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If CUBRID/win/cascci/cascci.def is no longer used, shouldn't it be deleted from the CUBRID repository?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will be deleted like remarks comment.

target_link_libraries(cascci LINK_PRIVATE ws2_32)
endif(WIN32)

Expand Down
4 changes: 2 additions & 2 deletions tools/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

if(UNIX)
set(CCI_APPLIER_SOURCES
${TOOLS_DIR}/cci_applier.c
${BASE_DIR}/cubrid_getopt_long.c
${CCI_TOOLS_DIR}/cci_applier.c
${CCI_BASE_DIR}/cubrid_getopt_long.c
)
SET_SOURCE_FILES_PROPERTIES(
${CCI_APPLIER_SOURCES}
Expand Down