diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 59aec0ca78..eef81c2eb5 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -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() @@ -138,8 +137,8 @@ if (BUILD_READERS) src/ThresholdBinarizer.h src/WhiteRectDetector.h src/WhiteRectDetector.cpp - $<$:${CMAKE_SOURCE_DIR}/wrappers/c/zxing-c.h> - $<$:${CMAKE_SOURCE_DIR}/wrappers/c/zxing-c.cpp> + $<$:src/zxing-c.h> + $<$:src/zxing-c.cpp> ) endif() if (BUILD_WRITERS) @@ -178,7 +177,7 @@ if (BUILD_READERS) src/ReaderOptions.h src/Result.h src/StructuredAppend.h - $<$:${CMAKE_SOURCE_DIR}/wrappers/c/zxing-c.h> + $<$:${CMAKE_CURRENT_SOURCE_DIR}/src/zxing-c.h> ) endif() if (BUILD_WRITERS) diff --git a/wrappers/c/zxing-c.cpp b/core/src/zxing-c.cpp similarity index 100% rename from wrappers/c/zxing-c.cpp rename to core/src/zxing-c.cpp diff --git a/wrappers/c/zxing-c.h b/core/src/zxing-c.h similarity index 100% rename from wrappers/c/zxing-c.h rename to core/src/zxing-c.h