ea5405bfa6
Allows simplifying the Makefile. Also faster compilation. Added CMake patch to fix compilation. Signed-off-by: Rosen Penev <rosenp@gmail.com>
44 lines
1.8 KiB
Diff
44 lines
1.8 KiB
Diff
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -224,41 +224,6 @@ set(tesseract_src ${tesseract_src}
|
|
src/api/pdfrenderer.cpp
|
|
)
|
|
|
|
-if (WIN32)
|
|
- if (MSVC)
|
|
- include_directories(src/vs2010/tesseract)
|
|
- set(tesseract_hdr
|
|
- ${tesseract_hdr}
|
|
- ${CMAKE_CURRENT_SOURCE_DIR}/src/vs2010/tesseract/resource.h)
|
|
- set(tesseract_rsc ${CMAKE_BINARY_DIR}/vs2010/tesseract/libtesseract.rc)
|
|
- set_source_files_properties(
|
|
- ${CMAKE_CURRENT_SOURCE_DIR}/src/arch/dotproductsse.cpp
|
|
- PROPERTIES COMPILE_DEFINITIONS __SSE4_1__)
|
|
- set_source_files_properties(
|
|
- ${CMAKE_CURRENT_SOURCE_DIR}/src/arch/intsimdmatrixsse.cpp
|
|
- PROPERTIES COMPILE_DEFINITIONS __SSE4_1__)
|
|
- set_source_files_properties(
|
|
- ${CMAKE_CURRENT_SOURCE_DIR}/src/arch/dotproductavx.cpp
|
|
- PROPERTIES COMPILE_FLAGS "/arch:AVX")
|
|
- set_source_files_properties(
|
|
- ${CMAKE_CURRENT_SOURCE_DIR}/src/arch/intsimdmatrixavx2.cpp
|
|
- PROPERTIES COMPILE_FLAGS "/arch:AVX2")
|
|
- endif()
|
|
-else()
|
|
- set_source_files_properties(
|
|
- ${CMAKE_CURRENT_SOURCE_DIR}/src/arch/dotproductsse.cpp
|
|
- PROPERTIES COMPILE_FLAGS "-msse4.1")
|
|
- set_source_files_properties(
|
|
- ${CMAKE_CURRENT_SOURCE_DIR}/src/arch/intsimdmatrixsse.cpp
|
|
- PROPERTIES COMPILE_FLAGS "-msse4.1")
|
|
- set_source_files_properties(
|
|
- ${CMAKE_CURRENT_SOURCE_DIR}/src/arch/dotproductavx.cpp
|
|
- PROPERTIES COMPILE_FLAGS "-mavx")
|
|
- set_source_files_properties(
|
|
- ${CMAKE_CURRENT_SOURCE_DIR}/src/arch/intsimdmatrixavx2.cpp
|
|
- PROPERTIES COMPILE_FLAGS "-mavx2")
|
|
-endif()
|
|
-
|
|
add_library (libtesseract ${LIBRARY_TYPE} ${tesseract_src} ${tesseract_hdr}
|
|
${tesseract_rsc}
|
|
)
|