Skip to content

Normalize C Binding Interface, Improve CMake Integration #96

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

Open
tayne3 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Normalize C Binding Interface, Improve CMake Integration #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7587b9f
fix(CMakeLists): ensure output directories are set only if not alread…
tayne3 Mar 30, 2025
0365efc
fix(CMakeLists): Improve C binding CMakeLists.txt for better componen…
tayne3 Mar 30, 2025
4dda709
fix(bindings): standardize C binding header and source implementation
tayne3 Mar 30, 2025
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
12 changes: 8 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,14 @@ cmake_minimum_required(VERSION 2.8.12)
project(CSerialPort LANGUAGES CXX)

# set output directory
if (CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
endif()
if(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
endif()
if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
endif()

# set build tpye
Expand Down
43 changes: 34 additions & 9 deletions bindings/c/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,42 @@ add_definitions(-DCSERIALPORT_DEBUG) # CSerialPort Debug Mode
add_definitions(-DCSERIALPORT_BINDING_LANGUAGE=C) # CSerialPort Binding Language

# set output directory
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
endif()
if(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
endif()
if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
endif()

# cserialport files
set(CSerialPortRootPath "${CMAKE_CURRENT_SOURCE_DIR}/../..")
include_directories(${CSerialPortRootPath}/include)
list(APPEND CSerialPortSourceFiles ${CSerialPortRootPath}/src/SerialPort.cpp ${CSerialPortRootPath}/src/SerialPortBase.cpp ${CSerialPortRootPath}/src/SerialPortInfo.cpp ${CSerialPortRootPath}/src/SerialPortInfoBase.cpp)
list(APPEND CSerialPortSourceFiles
${CSerialPortRootPath}/src/SerialPort.cpp
${CSerialPortRootPath}/src/SerialPortBase.cpp
${CSerialPortRootPath}/src/SerialPortInfo.cpp
${CSerialPortRootPath}/src/SerialPortInfoBase.cpp
)
if (WIN32)
list(APPEND CSerialPortSourceFiles ${CSerialPortRootPath}/src/SerialPortInfoWinBase.cpp ${CSerialPortRootPath}/src/SerialPortWinBase.cpp)
list(APPEND CSerialPortSourceFiles ${CSerialPortRootPath}/lib/version.rc)
list(APPEND CSerialPortSourceFiles
${CSerialPortRootPath}/src/SerialPortInfoWinBase.cpp
${CSerialPortRootPath}/src/SerialPortWinBase.cpp
)
list(APPEND CSerialPortSourceFiles
${CSerialPortRootPath}/lib/version.rc
)
elseif (UNIX)
list(APPEND CSerialPortSourceFiles ${CSerialPortRootPath}/src/SerialPortInfoUnixBase.cpp ${CSerialPortRootPath}/src/SerialPortUnixBase.cpp)
list(APPEND CSerialPortSourceFiles
${CSerialPortRootPath}/src/SerialPortInfoUnixBase.cpp
${CSerialPortRootPath}/src/SerialPortUnixBase.cpp
)
endif ()

add_library(${PROJECT_NAME} SHARED cserialport.cpp ${CSerialPortSourceFiles})
target_include_directories(cserialport PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(cserialport PRIVATE ${CSerialPortRootPath}/include)

if (WIN32)
target_link_libraries(${PROJECT_NAME} user32 advapi32 setupapi)
Expand All @@ -44,7 +64,12 @@ elseif (APPLE)
target_link_libraries(${PROJECT_NAME} ${FOUNDATION_LIBRARY} ${IOKIT_LIBRARY})
elseif (UNIX)
target_link_libraries(${PROJECT_NAME} pthread)
if(CMAKE_COMPILER_IS_GNUCC)
target_link_libraries(${PROJECT_NAME} rt)
endif()
endif ()

# example
add_subdirectory(example)
if (CSERIALPORT_BUILD_EXAMPLES)
add_subdirectory(example)
endif ()
8 changes: 4 additions & 4 deletions bindings/c/cserialport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ void CSerialPortAvailablePortInfosMalloc(SerialPortInfoArray *portInfoArray)
}
else
{
portInfoArray->portInfo = NULL;
portInfoArray->portInfo = nullptr;
}
}

Expand All @@ -77,12 +77,12 @@ void CSerialPortAvailablePortInfosFree(struct SerialPortInfoArray *portInfoArray
if (portInfoArray)
{
delete[] portInfoArray->portInfo;
portInfoArray->portInfo = NULL;
portInfoArray->portInfo = nullptr;
portInfoArray->size = 0;
}
}

i_handle_t CSerialPortMalloc()
i_handle_t CSerialPortMalloc(void)
{
return reinterpret_cast<i_handle_t>(new itas109::CSerialPort());
}
Expand All @@ -93,7 +93,7 @@ void CSerialPortFree(i_handle_t handle)
if (pCSP)
{
delete pCSP;
pCSP = NULL;
pCSP = nullptr;
}
}

Expand Down
2 changes: 1 addition & 1 deletion bindings/c/cserialport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ extern "C"

C_DLL_EXPORT void CSerialPortAvailablePortInfosFree(struct SerialPortInfoArray *portInfoArray);

C_DLL_EXPORT i_handle_t CSerialPortMalloc();
C_DLL_EXPORT i_handle_t CSerialPortMalloc(void);

C_DLL_EXPORT void CSerialPortFree(i_handle_t handle);

Expand Down