From d2e1cfdf4ece3d8fb9cc578e051eebae2ffcae12 Mon Sep 17 00:00:00 2001 From: Niclas Antti Date: Sat, 16 Jun 2018 10:31:06 +0300 Subject: [PATCH] MXS-1777 fix CMakeLists.txt for utility library Last minute directory changes were not fully applied in CMakeLists.txt --- CMakeLists.txt | 2 +- maxutils/maxbase/CMakeLists.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fc9a63af2..fd3ea78c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -166,7 +166,7 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${DEBUG_FLAGS} -DSS_DEBUG -D set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wno-deprecated-declarations -Wno-uninitialized -std=c++11") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -ggdb -Wno-deprecated-declarations -Wno-uninitialized -std=c++11") -include_directories(util) +include_directories(maxutils/maxbase/include) include_directories(include) include_directories(server/inih) include_directories(server/modules/include) diff --git a/maxutils/maxbase/CMakeLists.txt b/maxutils/maxbase/CMakeLists.txt index 577aa96d7..d8c8f1485 100644 --- a/maxutils/maxbase/CMakeLists.txt +++ b/maxutils/maxbase/CMakeLists.txt @@ -1,4 +1,4 @@ include_directories(include) -add_library(maxutil SHARED src/eventcount.cc src/stopwatch.cc) -set_target_properties(maxutil PROPERTIES VERSION "1.0.0") -install_module(maxutil core) +add_library(maxbase SHARED src/eventcount.cc src/stopwatch.cc) +set_target_properties(maxbase PROPERTIES VERSION "1.0.0") +install_module(maxbase core)