1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-26 06:27:45 +00:00

Make windows happy... sort of

This commit is contained in:
Mordred 2018-10-25 17:34:58 +02:00
parent 2c0778a9a7
commit 00adaaa6ce
2 changed files with 16 additions and 2 deletions

View file

@ -9,6 +9,13 @@ file( GLOB UTILS_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*" )
set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
add_library( xivdat ${UTILS_PUBLIC_INCLUDE_FILES} ${UTILS_SOURCE_FILES} ) add_library( xivdat ${UTILS_PUBLIC_INCLUDE_FILES} ${UTILS_SOURCE_FILES} )
set_target_properties( xivdat PROPERTIES
CXX_STANDARD 17
CXX_STANDARD_REQUIRED ON
CXX_EXTENSIONS ON
)
if (UNIX) if (UNIX)
target_link_libraries( xivdat PUBLIC dl ) target_link_libraries( xivdat PUBLIC dl )
target_link_libraries( xivdat PUBLIC z ) target_link_libraries( xivdat PUBLIC z )

View file

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0.2) cmake_minimum_required(VERSION 3.10.0)
project(Sapphire) project(Sapphire)
@ -8,11 +8,18 @@ file( GLOB UTILS_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*" )
set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
add_library( mysqlConnector ${UTILS_PUBLIC_INCLUDE_FILES} ${UTILS_SOURCE_FILES} ) add_library( mysqlConnector ${UTILS_PUBLIC_INCLUDE_FILES} ${UTILS_SOURCE_FILES} )
set_target_properties( mysqlConnector PROPERTIES
CXX_STANDARD 17
CXX_STANDARD_REQUIRED ON
CXX_EXTENSIONS ON
)
target_include_directories( mysqlConnector PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) target_include_directories( mysqlConnector PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} )
if(UNIX) if(UNIX)
target_include_directories( mysqlConnector PUBLIC "/usr/include/mysql/" ) target_include_directories( mysqlConnector PUBLIC "/usr/include/mysql/" )
else() else()
target_include_directories( mysqlConnector PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../../external/MySQL/" ) target_include_directories( mysqlConnector PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../MySQL/" )
endif() endif()
cotire(mysqlConnector) cotire(mysqlConnector)