diff --git a/CMakeLists.txt b/CMakeLists.txt index ffd0e1a66..196df01b0 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,29 +48,22 @@ set(S3API_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libmarias3) include(ExternalProject) ExternalProject_Add(marias3 SOURCE_DIR ${S3API_DIR} - CONFIGURE_COMMAND autoreconf ${S3API_DIR} && ${S3API_DIR}/configure --enable-shared=no --prefix=${CMAKE_CURRENT_BINARY_DIR} ${S3_CONFIGURE_OPT} + CONFIGURE_COMMAND autoreconf -fi ${S3API_DIR} && ${S3API_DIR}/configure --enable-shared=no --prefix=${CMAKE_CURRENT_BINARY_DIR} ${S3_CONFIGURE_OPT} BUILD_COMMAND make BUILD_IN_SOURCE 0 INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR} ) - -#add_custom_command(TARGET marias3 -# PRE_BUILD -# COMMAND autoreconf -fi -# WORKING_DIRECTORY ${S3API_DIR} -#) - - +link_directories(${CMAKE_CURRENT_BINARY_DIR}/lib) add_executable(StorageManager src/main.cpp ${storagemanager_SRCS}) add_dependencies(StorageManager marias3) -link_directories(${CMAKE_CURRENT_BINARY_DIR}/lib) target_link_libraries(StorageManager boost_system boost_thread boost_filesystem boost_regex libmarias3.a) +set_property(TARGET StorageManager PROPERTY CXX_STANDARD 11) add_executable(unit_tests src/unit_tests.cpp ${storagemanager_SRCS}) add_dependencies(unit_tests marias3) target_link_libraries(unit_tests boost_system boost_thread boost_filesystem boost_regex libmarias3.a) - +set_property(TARGET unit_tests PROPERTY CXX_STANDARD 11) #install(TARGETS StorageManager DESTINATION ${ENGINE_BINDIR} COMPONENT platform) diff --git a/libmarias3 b/libmarias3 index f37284fc7..b1e256cbd 160000 --- a/libmarias3 +++ b/libmarias3 @@ -1 +1 @@ -Subproject commit f37284fc72babac4ae1a60e2e484774f28732cac +Subproject commit b1e256cbd4ab647c3a400ef9422e67426b882d51