Skip to content

Commit

Permalink
c-API: move implementation and header files into core/src
Browse files Browse the repository at this point in the history
This helps in building the C_API for the rust wrapper in a sub-directory.

Also remove the outdated inclusion of ../zxing.cmake
  • Loading branch information
axxel committed Jan 19, 2024
1 parent 9b0cdd4 commit 7e3f5be
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.15)
project (ZXing VERSION "2.2.1")
set (ZXING_SONAME 3) # see https://github.com/zxing-cpp/zxing-cpp/issues/333

include(../zxing.cmake)
if (BUILD_SHARED_LIBS)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
endif()
Expand Down Expand Up @@ -138,8 +137,8 @@ if (BUILD_READERS)
src/ThresholdBinarizer.h
src/WhiteRectDetector.h
src/WhiteRectDetector.cpp
$<$<BOOL:${BUILD_C_API}>:${CMAKE_SOURCE_DIR}/wrappers/c/zxing-c.h>
$<$<BOOL:${BUILD_C_API}>:${CMAKE_SOURCE_DIR}/wrappers/c/zxing-c.cpp>
$<$<BOOL:${BUILD_C_API}>:src/zxing-c.h>
$<$<BOOL:${BUILD_C_API}>:src/zxing-c.cpp>
)
endif()
if (BUILD_WRITERS)
Expand Down Expand Up @@ -178,7 +177,7 @@ if (BUILD_READERS)
src/ReaderOptions.h
src/Result.h
src/StructuredAppend.h
$<$<BOOL:${BUILD_C_API}>:${CMAKE_SOURCE_DIR}/wrappers/c/zxing-c.h>
$<$<BOOL:${BUILD_C_API}>:${CMAKE_CURRENT_SOURCE_DIR}/src/zxing-c.h>
)
endif()
if (BUILD_WRITERS)
Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 7e3f5be

Please sign in to comment.