Skip to content

Commit eeeae3a

Browse files
committed
Fix linking
1 parent f3327cb commit eeeae3a

File tree

5 files changed

+19
-6
lines changed

5 files changed

+19
-6
lines changed

clang-format-this

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/bash
2+
3+
for f in $(
4+
find .. \
5+
\( \( -type d \( -name 'build*' -o -name 'etc' -o -name '3rdparty' \) \) -prune \) \
6+
-o \( -regextype egrep -type f -regex ".*\.(cpp|hpp)" \)
7+
); do
8+
if [ -d "$f" ]; then
9+
continue
10+
fi
11+
clang-tidy --checks='-*,llvm-include-order' "$f" #'*,-llvm-namespace-comment,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-*-braces-around-statements,-hicpp-no-array-decay,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-readability-implicit-bool-conversion,-*-no-malloc,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-bounds-constant-array-index' "$f"
12+
read -p "[ENTER TO CONTINUE]" dummy
13+
done

io/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ find_package(Compsky REQUIRED asciify mysql)
88

99
add_executable(rscraper-export "${CMAKE_CURRENT_SOURCE_DIR}/src/export.cpp")
1010
target_include_directories(rscraper-export PRIVATE ${COMPSKY_INCLUDE_DIRS})
11-
target_link_libraries(rscraper-export compsky_mysql compsky_asciify mysqlclient)
11+
target_link_libraries(rscraper-export compsky_mysql compsky_asciify ${WHICH_MYSQL_CLIENT})
1212
set_property(TARGET rscraper-export PROPERTY CXX_STANDARD 17)
1313

1414
add_executable(rscraper-import "${CMAKE_CURRENT_SOURCE_DIR}/src/import.cpp")
1515
target_include_directories(rscraper-import PRIVATE ${COMPSKY_INCLUDE_DIRS})
16-
target_link_libraries(rscraper-import compsky_mysql compsky_asciify mysqlclient)
16+
target_link_libraries(rscraper-import compsky_mysql compsky_asciify ${WHICH_MYSQL_CLIENT})
1717
set_property(TARGET rscraper-import PROPERTY CXX_STANDARD 17)
1818

1919
install(

scraper/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ if("rscrape-cmnts" IN_LIST MY_TARGETS)
6969
endif()
7070
target_link_libraries(rscrape-cmnts curl)
7171
target_link_libraries(rscrape-cmnts compsky_mysql)
72-
target_link_libraries(rscrape-cmnts mysqlclient)
72+
target_link_libraries(rscrape-cmnts ${WHICH_MYSQL_CLIENT})
7373
target_link_libraries(rscrape-cmnts compsky_asciify)
7474
#target_link_libraries(rscrape-cmnts stdc++fs)
7575
if(Boost_FOUND)

tagger/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ set(INC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")
2525
include_directories("${INC_DIR}")
2626

2727
add_library(rscraper-tagger SHARED "${SRC_DIR}/tagger.cpp")
28-
target_link_libraries(rscraper-tagger mysqlclient compsky_asciify compsky_mysql)
28+
target_link_libraries(rscraper-tagger ${WHICH_MYSQL_CLIENT} compsky_asciify compsky_mysql)
2929
set_property(TARGET rscraper-tagger PROPERTY CXX_STANDARD 17)
3030

3131

utils/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ target_compile_definitions(rscraper-str2id PRIVATE STR2ID_EXE)
1919

2020
add_executable(rscraped-reason "${SRC_DIR}/cmnts_from_subs_tagged.cpp" "${SRC_DIR}/id2str.cpp")
2121
set_property(TARGET rscraped-reason PROPERTY CXX_STANDARD 17)
22-
target_link_libraries(rscraped-reason mysqlclient compsky_asciify compsky_mysql)
22+
target_link_libraries(rscraped-reason ${WHICH_MYSQL_CLIENT} compsky_asciify compsky_mysql)
2323
if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows" AND NOT ${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
2424
target_link_libraries(rscraped-reason z secur32 ssl crypto crypt32 ws2_32)
2525
endif()
2626

2727
add_executable(rscraped-tagged-subs "${SRC_DIR}/cmnts_from_subs_tagged.cpp" "${SRC_DIR}/id2str.cpp")
2828
set_property(TARGET rscraped-tagged-subs PROPERTY CXX_STANDARD 17)
29-
target_link_libraries(rscraped-tagged-subs mysqlclient compsky_asciify compsky_mysql)
29+
target_link_libraries(rscraped-tagged-subs ${WHICH_MYSQL_CLIENT} compsky_asciify compsky_mysql)
3030
target_compile_definitions(rscraped-tagged-subs PRIVATE SUB2TAG)
3131
if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows" AND NOT ${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
3232
target_link_libraries(rscraped-tagged-subs z secur32 ssl crypto crypt32 ws2_32)

0 commit comments

Comments
 (0)