@@ -73,7 +73,7 @@ if(${mode} AND (CMAKE_BUILD_TYPE STREQUAL "Debug"))
7373 endif ()
7474 else ()
7575 set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wextra" )
76- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pthread -g -fsanitize=address -DASIO_STANDALONE -DBENCHMARK -DDEBUG ${BOOST_OPEN} ${GD_OPEN} -I/usr/local/include -I/usr/local/mysql/ include -I/usr/include -I/usr/include/mysql " )
76+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pthread -g -fsanitize=address -DASIO_STANDALONE -DBENCHMARK -DDEBUG ${BOOST_OPEN} ${GD_OPEN} -I/usr/local/include -I/usr/include " )
7777 endif ()
7878 message ("Debug mode:${CMAKE_CXX_FLAGS_DEBUG} " )
7979
@@ -86,7 +86,7 @@ elseif(${mode} AND (CMAKE_BUILD_TYPE STREQUAL "Release"))
8686 endif ()
8787 else ()
8888 set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall -Wextra -O3" )
89- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -DASIO_STANDALONE ${BOOST_OPEN} ${GD_OPEN} -DBENCHMARK -I/usr/local/include -I/usr/local/mysql/ include -I/usr/include -I/usr/include/mysql " )
89+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -DASIO_STANDALONE ${BOOST_OPEN} ${GD_OPEN} -DBENCHMARK -I/usr/local/include -I/usr/include " )
9090 file (MAKE_DIRECTORY /usr/local/etc/paozhu)
9191 file (COPY ${CMAKE_CURRENT_SOURCE_DIR} /conf/ DESTINATION /usr/local/etc/paozhu/)
9292 endif ()
@@ -95,7 +95,7 @@ elseif(${mode} AND (CMAKE_BUILD_TYPE STREQUAL "Release"))
9595else ()
9696 set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wextra" )
9797 message ("Debug mode:${CMAKE_CXX_FLAGS_DEBUG} " )
98- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pthread -g -fsanitize=address -DASIO_STANDALONE -DBENCHMARK -DDEBUG ${BOOST_OPEN} ${GD_OPEN} -I/usr/local/include -I/usr/local/mysql/ include -I/usr/include -I/usr/include/mysql " )
98+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pthread -g -fsanitize=address -DASIO_STANDALONE -DBENCHMARK -DDEBUG ${BOOST_OPEN} ${GD_OPEN} -I/usr/local/include -I/usr/include " )
9999
100100 if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows" )
101101 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address" )
@@ -122,6 +122,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/vendor/httpcli)
122122include_directories (${CMAKE_CURRENT_SOURCE_DIR} /viewsrc/include )
123123include_directories (${CMAKE_CURRENT_SOURCE_DIR} /websockets/include )
124124include_directories (${CMAKE_CURRENT_SOURCE_DIR} /include )
125+ include_directories (${CMAKE_CURRENT_SOURCE_DIR} /orm)
125126
126127if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR} /bin/paozhu_pre)
127128 file (REMOVE_RECURSE ${CMAKE_CURRENT_SOURCE_DIR} /bin/paozhu_pre)
@@ -191,7 +192,7 @@ include_sub_directories_recursively(${CMAKE_CURRENT_SOURCE_DIR}/libs)
191192include_sub_directories_recursively(${CMAKE_CURRENT_SOURCE_DIR} /include )
192193include_sub_directories_recursively(${CMAKE_CURRENT_SOURCE_DIR} /common)
193194
194- add_executable (paozhu_cli ${CMAKE_CURRENT_SOURCE_DIR} /vendor/httpcli/http_cli.cpp)
195+ add_executable (paozhu_cli ${CMAKE_CURRENT_SOURCE_DIR} /vendor/httpcli/http_cli.cpp ${CMAKE_CURRENT_SOURCE_DIR} /vendor/httpserver/src/mysql_conn.cpp ${CMAKE_CURRENT_SOURCE_DIR} /vendor/httpserver/src/mysql_conn_pool.cpp ${CMAKE_CURRENT_SOURCE_DIR} /vendor/httpserver/src/clientdatacache.cpp )
195196set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} /bin)
196197
197198
@@ -230,14 +231,17 @@ if (ENABLE_VCPKG)
230231 target_link_libraries (paozhu ZLIB::ZLIB)
231232
232233 # find_package(libmysql REQUIRED)
233- find_package (unofficial-libmariadb CONFIG REQUIRED)
234- find_path (MYSQL_ROOT_DIR mysql)
234+ # find_package(unofficial-libmariadb CONFIG REQUIRED)
235+ # find_path(MYSQL_ROOT_DIR mysql)
235236 # target_link_libraries(paozhu ${MYSQL_LIBRARIES})
236237 # target_link_libraries(paozhu_cli ${MYSQL_LIBRARIES})
237- target_link_libraries (paozhu unofficial::libmariadb)
238- target_link_libraries (paozhu_cli unofficial::libmariadb)
239- target_include_directories (paozhu PUBLIC ${MYSQL_ROOT_DIR} /mysql)
240- target_include_directories (paozhu_cli PUBLIC ${MYSQL_ROOT_DIR} /mysql)
238+ # target_link_libraries(paozhu unofficial::libmariadb)
239+ # target_link_libraries(paozhu_cli unofficial::libmariadb)
240+ # target_include_directories(paozhu PUBLIC ${MYSQL_ROOT_DIR}/mysql)
241+ # target_include_directories(paozhu_cli PUBLIC ${MYSQL_ROOT_DIR}/mysql)
242+
243+ target_link_libraries (paozhu_cli asio::asio)
244+ target_link_libraries (paozhu_cli OpenSSL::Crypto OpenSSL::SSL)
241245
242246 if (ENABLE_GD STREQUAL "ON" )
243247 find_package (PkgConfig)
@@ -331,6 +335,9 @@ if(OPENSSL_FOUND)
331335 INCLUDE_DIRECTORIES ("${OPENSSL_INCLUDE_DIR} " )
332336 target_link_libraries (paozhu ${OPENSSL_SSL_LIBRARY} )
333337 target_link_libraries (paozhu ${OPENSSL_CRYPTO_LIBRARY} )
338+
339+ target_link_libraries (paozhu_cli ${OPENSSL_SSL_LIBRARY} )
340+ target_link_libraries (paozhu_cli ${OPENSSL_CRYPTO_LIBRARY} )
334341endif ()
335342
336343
@@ -343,80 +350,80 @@ if(ZLIB_FOUND)
343350endif ()
344351
345352
346- if (CMAKE_SYSTEM_NAME MATCHES "Darwin" )
347- if (IS_DIRECTORY "/usr/local/mysql/include" )
348- MESSAGE ( STATUS "/usr/local/mysql" )
349- set (MYSQL_INCLUDE_DIR "/usr/local/mysql/include" )
350- include_sub_directories_recursively(/usr/local/mysql/include )
351- endif ()
352-
353- if (IS_DIRECTORY "/usr/local/opt/mysql-client" )
354- MESSAGE ( STATUS "/usr/local/opt/mysql-client" )
355- set (MYSQL_INCLUDE_DIR "/usr/local/opt/mysql-client/include" )
356- include_sub_directories_recursively(/usr/local/opt/mysql-client/include )
357- endif ()
358-
359- if (IS_DIRECTORY "/opt/homebrew/opt/mysql" )
360- MESSAGE ( STATUS "/opt/homebrew/opt/mysql" )
361- set (MYSQL_INCLUDE_DIR "/opt/homebrew/opt/mysql/include" )
362- include_sub_directories_recursively(/opt/homebrew/opt/mysql/include )
363- endif ()
364-
365-
366- if (IS_DIRECTORY "/opt/homebrew/opt/mysql-client" )
367- MESSAGE ( STATUS "/opt/homebrew/opt/mysql-client" )
368- set (MYSQL_INCLUDE_DIR "/opt/homebrew/opt/mysql-client/include" )
369- include_sub_directories_recursively(/opt/homebrew/opt/mysql-client/include )
370- endif ()
371- MESSAGE ( STATUS "MYSQL_ROOT_DIR = ${MYSQL_ROOT_DIR} " )
372- else ()
373- find_path (MYSQL_ROOT_DIR mysql)
374- endif ()
375-
376-
377- FIND_PATH (MYSQL_INCLUDE_DIR NAMES mysql.h
378- PATHS /usr/local/include /mysql /usr/include /mysql /opt/homebrew/opt/mysql/include /usr/local/opt/mysql-client/include /opt/homebrew/opt/mysql-client/include
379- )
380-
381- MESSAGE ( STATUS "MYSQL_ROOT_DIR = ${MYSQL_ROOT_DIR} " )
382- find_package_handle_standard_args(mysql REQUIRED_VARS MYSQL_ROOT_DIR)
383-
384-
385- if (NOT MYSQL_INCLUDE_DIR)
386- message (STATUS "Could not find \" mysql.h\" from searching " )
387- endif ()
388-
389- SET (MYSQL_NAMES mysqlclient)
390- FIND_LIBRARY (MYSQL_LIBRARY
391- NAMES ${MYSQL_NAMES}
392- PATHS /usr/lib /usr/local/lib /usr/local/mysql/lib /usr/local/opt/mysql/lib /opt/homebrew/opt/mysql/lib /opt/homebrew/opt/mysql-client/lib
393- PATH_SUFFIXES mysql
394- )
395-
396- IF (MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY)
397- SET (MYSQL_FOUND TRUE )
398- SET ( MYSQL_LIBRARIES ${MYSQL_LIBRARY} )
399- ELSE (MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY)
400- SET (MYSQL_FOUND FALSE )
401- SET ( MYSQL_LIBRARIES )
402- ENDIF (MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY)
403-
404- IF (MYSQL_FOUND)
405- IF (NOT MYSQL_FIND_QUIETLY)
406- MESSAGE (STATUS "Found MySQL: ${MYSQL_LIBRARY} " )
407- ENDIF (NOT MYSQL_FIND_QUIETLY)
408- ELSE (MYSQL_FOUND)
409- IF (MYSQL_FIND_REQUIRED)
410- MESSAGE (STATUS "Looked for MySQL libraries named ${MYSQL_NAMES} ." )
411- MESSAGE (FATAL_ERROR "Could NOT find MySQL library" )
412- ENDIF (MYSQL_FIND_REQUIRED)
413- ENDIF (MYSQL_FOUND)
414-
415- target_include_directories (paozhu PUBLIC ${MYSQL_INCLUDE_DIR} )
416- target_link_libraries (paozhu ${MYSQL_LIBRARY} )
417-
418- target_include_directories (paozhu_cli PUBLIC ${MYSQL_INCLUDE_DIR} )
419- target_link_libraries (paozhu_cli ${MYSQL_LIBRARY} )
353+ # if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
354+ # if (IS_DIRECTORY "/usr/local/mysql/include")
355+ # MESSAGE( STATUS "/usr/local/mysql")
356+ # set(MYSQL_INCLUDE_DIR "/usr/local/mysql/include")
357+ # include_sub_directories_recursively(/usr/local/mysql/include)
358+ # endif()
359+ #
360+ # if (IS_DIRECTORY "/usr/local/opt/mysql-client")
361+ # MESSAGE( STATUS "/usr/local/opt/mysql-client")
362+ # set(MYSQL_INCLUDE_DIR "/usr/local/opt/mysql-client/include")
363+ # include_sub_directories_recursively(/usr/local/opt/mysql-client/include)
364+ # endif()
365+ #
366+ # if (IS_DIRECTORY "/opt/homebrew/opt/mysql")
367+ # MESSAGE( STATUS "/opt/homebrew/opt/mysql")
368+ # set(MYSQL_INCLUDE_DIR "/opt/homebrew/opt/mysql/include")
369+ # include_sub_directories_recursively(/opt/homebrew/opt/mysql/include)
370+ # endif()
371+ #
372+ #
373+ # if (IS_DIRECTORY "/opt/homebrew/opt/mysql-client")
374+ # MESSAGE( STATUS "/opt/homebrew/opt/mysql-client")
375+ # set(MYSQL_INCLUDE_DIR "/opt/homebrew/opt/mysql-client/include")
376+ # include_sub_directories_recursively(/opt/homebrew/opt/mysql-client/include)
377+ # endif()
378+ # MESSAGE( STATUS "MYSQL_ROOT_DIR = ${MYSQL_ROOT_DIR} ")
379+ # else()
380+ # find_path(MYSQL_ROOT_DIR mysql)
381+ # endif()
382+ #
383+ #
384+ # FIND_PATH(MYSQL_INCLUDE_DIR NAMES mysql.h
385+ # PATHS /usr/local/include/mysql /usr/include/mysql /opt/homebrew/opt/mysql/include /usr/local/opt/mysql-client/include /opt/homebrew/opt/mysql-client/include
386+ # )
387+ #
388+ # MESSAGE( STATUS "MYSQL_ROOT_DIR = ${MYSQL_ROOT_DIR} ")
389+ # find_package_handle_standard_args(mysql REQUIRED_VARS MYSQL_ROOT_DIR)
390+ #
391+ #
392+ # if(NOT MYSQL_INCLUDE_DIR)
393+ # message(STATUS "Could not find \"mysql.h\" from searching ")
394+ # endif()
395+ #
396+ # SET(MYSQL_NAMES mysqlclient)
397+ # FIND_LIBRARY(MYSQL_LIBRARY
398+ # NAMES ${MYSQL_NAMES}
399+ # PATHS /usr/lib /usr/local/lib /usr/local/mysql/lib /usr/local/opt/mysql/lib /opt/homebrew/opt/mysql/lib /opt/homebrew/opt/mysql-client/lib
400+ # PATH_SUFFIXES mysql
401+ # )
402+ #
403+ # IF (MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY)
404+ # SET(MYSQL_FOUND TRUE)
405+ # SET( MYSQL_LIBRARIES ${MYSQL_LIBRARY} )
406+ # ELSE (MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY)
407+ # SET(MYSQL_FOUND FALSE)
408+ # SET( MYSQL_LIBRARIES )
409+ # ENDIF (MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY)
410+ #
411+ # IF (MYSQL_FOUND)
412+ # IF (NOT MYSQL_FIND_QUIETLY)
413+ # MESSAGE(STATUS "Found MySQL: ${MYSQL_LIBRARY}")
414+ # ENDIF (NOT MYSQL_FIND_QUIETLY)
415+ # ELSE (MYSQL_FOUND)
416+ # IF (MYSQL_FIND_REQUIRED)
417+ # MESSAGE(STATUS "Looked for MySQL libraries named ${MYSQL_NAMES}.")
418+ # MESSAGE(FATAL_ERROR "Could NOT find MySQL library")
419+ # ENDIF (MYSQL_FIND_REQUIRED)
420+ # ENDIF (MYSQL_FOUND)
421+ #
422+ # target_include_directories(paozhu PUBLIC ${MYSQL_INCLUDE_DIR})
423+ # target_link_libraries(paozhu ${MYSQL_LIBRARY})
424+ #
425+ # target_include_directories(paozhu_cli PUBLIC ${MYSQL_INCLUDE_DIR})
426+ # target_link_libraries(paozhu_cli ${MYSQL_LIBRARY})
420427
421428
422429
0 commit comments