Skip to content

Commit 0dcb6b3

Browse files
committed
Rename cppan/cmake projects.
1 parent a011b15 commit 0dcb6b3

File tree

3 files changed

+24
-25
lines changed

3 files changed

+24
-25
lines changed

CMakeLists.txt

+15-16
Original file line numberDiff line numberDiff line change
@@ -213,30 +213,30 @@ set(tesseract_src ${tesseract_src}
213213
api/pdfrenderer.cpp
214214
)
215215

216-
add_library (tesseract ${LIBRARY_TYPE} ${tesseract_src} ${tesseract_hdr})
216+
add_library (libtesseract ${LIBRARY_TYPE} ${tesseract_src} ${tesseract_hdr})
217217
if (NOT STATIC)
218-
target_compile_definitions (tesseract
218+
target_compile_definitions (libtesseract
219219
PRIVATE -DTESS_EXPORTS
220220
INTERFACE -DTESS_IMPORTS
221221
)
222-
set_target_properties (tesseract PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS True)
222+
set_target_properties (libtesseract PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS True)
223223
endif()
224-
target_link_libraries (tesseract ${LIB_Ws2_32} ${LIB_pthread})
225-
set_target_properties (tesseract PROPERTIES VERSION ${VERSION_MAJOR}.${VERSION_MINOR_0}.${VERSION_MINOR_1})
226-
set_target_properties (tesseract PROPERTIES SOVERSION ${VERSION_MAJOR}.${VERSION_MINOR_0}.${VERSION_MINOR_1})
224+
target_link_libraries (libtesseract ${LIB_Ws2_32} ${LIB_pthread})
225+
set_target_properties (libtesseract PROPERTIES VERSION ${VERSION_MAJOR}.${VERSION_MINOR_0}.${VERSION_MINOR_1})
226+
set_target_properties (libtesseract PROPERTIES SOVERSION ${VERSION_MAJOR}.${VERSION_MINOR_0}.${VERSION_MINOR_1})
227227
if (WIN32)
228-
set_target_properties (tesseract PROPERTIES OUTPUT_NAME tesseract${VERSION_MAJOR}${VERSION_MINOR})
229-
set_target_properties (tesseract PROPERTIES DEBUG_OUTPUT_NAME tesseract${VERSION_MAJOR}${VERSION_MINOR}d)
228+
set_target_properties (libtesseract PROPERTIES OUTPUT_NAME tesseract${VERSION_MAJOR}${VERSION_MINOR})
229+
set_target_properties (libtesseract PROPERTIES DEBUG_OUTPUT_NAME tesseract${VERSION_MAJOR}${VERSION_MINOR}d)
230230
endif()
231231

232232
if (NOT CPPAN_BUILD)
233-
target_link_libraries (tesseract ${Leptonica_LIBRARIES})
234-
export(TARGETS tesseract FILE ${CMAKE_BINARY_DIR}/TesseractTargets.cmake)
233+
target_link_libraries (libtesseract ${Leptonica_LIBRARIES})
234+
export(TARGETS libtesseract FILE ${CMAKE_BINARY_DIR}/TesseractTargets.cmake)
235235
else()
236-
target_link_libraries (tesseract pvt.cppan.demo.danbloomberg.leptonica)
237-
add_dependencies (tesseract cppan)
236+
target_link_libraries (libtesseract pvt.cppan.demo.danbloomberg.leptonica)
237+
add_dependencies (libtesseract cppan)
238238
file(WRITE ${CMAKE_BINARY_DIR}/TesseractTargets.cmake "include(${CMAKE_BINARY_DIR}/cppan.cmake)\n")
239-
export(TARGETS tesseract APPEND FILE ${CMAKE_BINARY_DIR}/TesseractTargets.cmake)
239+
export(TARGETS libtesseract APPEND FILE ${CMAKE_BINARY_DIR}/TesseractTargets.cmake)
240240
endif()
241241

242242
########################################
@@ -248,9 +248,8 @@ set(tesseractmain_src
248248
vs2010/tesseract/resource.h
249249
vs2010/tesseract/tesseract.rc
250250
)
251-
add_executable (tesseractmain ${tesseractmain_src})
252-
target_link_libraries (tesseractmain tesseract)
253-
set_target_properties (tesseractmain PROPERTIES OUTPUT_NAME tesseract)
251+
add_executable (tesseract ${tesseractmain_src})
252+
target_link_libraries (tesseract libtesseract)
254253

255254
########################################
256255

cppan.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ common_settings:
1717
c++: 11
1818

1919
projects:
20-
tesseract:
20+
libtesseract:
2121
type: lib
2222
export_all_symbols: true
2323
files:
@@ -136,7 +136,7 @@ projects:
136136
dependencies:
137137
pvt.cppan.demo.danbloomberg.leptonica: 1
138138

139-
tesseractmain:
139+
tesseract:
140140
files: api/tesseractmain.cpp
141141
dependencies:
142142
- tesseract

training/CMakeLists.txt

+7-7
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ set(common_training_src
7878
commontraining.h
7979
)
8080
add_library (common_training ${common_training_src})
81-
target_link_libraries (common_training tesseract tessopt)
81+
target_link_libraries (common_training libtesseract tessopt)
8282
project_group (common_training "Training Tools")
8383

8484

@@ -87,7 +87,7 @@ project_group (common_training "Training Tools")
8787
########################################
8888

8989
add_executable (ambiguous_words ambiguous_words.cpp)
90-
target_link_libraries (ambiguous_words tesseract)
90+
target_link_libraries (ambiguous_words libtesseract)
9191
project_group (ambiguous_words "Training Tools")
9292

9393

@@ -105,7 +105,7 @@ project_group (classifier_tester "Training Tools")
105105
########################################
106106

107107
add_executable (combine_tessdata combine_tessdata.cpp)
108-
target_link_libraries (combine_tessdata tesseract)
108+
target_link_libraries (combine_tessdata libtesseract)
109109
project_group (combine_tessdata "Training Tools")
110110

111111

@@ -123,7 +123,7 @@ project_group (cntraining "Training Tools")
123123
########################################
124124

125125
add_executable (dawg2wordlist dawg2wordlist.cpp)
126-
target_link_libraries (dawg2wordlist tesseract)
126+
target_link_libraries (dawg2wordlist libtesseract)
127127
project_group (dawg2wordlist "Training Tools")
128128

129129

@@ -150,7 +150,7 @@ project_group (shapeclustering "Training Tools")
150150
########################################
151151

152152
add_executable (unicharset_extractor unicharset_extractor.cpp)
153-
target_link_libraries (unicharset_extractor tesseract tessopt)
153+
target_link_libraries (unicharset_extractor libtesseract tessopt)
154154
project_group (unicharset_extractor "Training Tools")
155155

156156

@@ -159,7 +159,7 @@ project_group (unicharset_extractor "Training Tools")
159159
########################################
160160

161161
add_executable (wordlist2dawg wordlist2dawg.cpp)
162-
target_link_libraries (wordlist2dawg tesseract)
162+
target_link_libraries (wordlist2dawg libtesseract)
163163
project_group (wordlist2dawg "Training Tools")
164164

165165

@@ -262,7 +262,7 @@ endif()
262262
add_executable (text2image ${text2image_src})
263263
target_include_directories (text2image BEFORE PRIVATE ${Cairo_INCLUDE_DIRS} ${Pango_INCLUDE_DIRS})
264264
target_compile_definitions (text2image PRIVATE -DPANGO_ENABLE_ENGINE)
265-
target_link_libraries (text2image tesseract unicharset_training
265+
target_link_libraries (text2image libtesseract unicharset_training
266266
${Pango_LIBRARIES}
267267
${Cairo_LIBRARIES}
268268
${PangoCairo_LIBRARIES}

0 commit comments

Comments
 (0)