diff --git a/deps/datReader/CMakeLists.txt b/deps/datReader/CMakeLists.txt index e01dbf8f..8adc27e7 100644 --- a/deps/datReader/CMakeLists.txt +++ b/deps/datReader/CMakeLists.txt @@ -9,6 +9,13 @@ file( GLOB UTILS_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*" ) set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) 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) target_link_libraries( xivdat PUBLIC dl ) target_link_libraries( xivdat PUBLIC z ) diff --git a/deps/mysqlConnector/CMakeLists.txt b/deps/mysqlConnector/CMakeLists.txt index 0871abe2..02fb9f68 100644 --- a/deps/mysqlConnector/CMakeLists.txt +++ b/deps/mysqlConnector/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0.2) +cmake_minimum_required(VERSION 3.10.0) 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} ) 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} ) if(UNIX) target_include_directories( mysqlConnector PUBLIC "/usr/include/mysql/" ) else() - target_include_directories( mysqlConnector PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../../external/MySQL/" ) + target_include_directories( mysqlConnector PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../MySQL/" ) endif() cotire(mysqlConnector)