Skip to content

Commit 7d6a242

Browse files
committed
Fix CMake
1 parent 1ffd567 commit 7d6a242

5 files changed

Lines changed: 7 additions & 3 deletions

File tree

src/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ set(INTERCEPT_INCLUDE_PATH "${INTERCEPT_CLIENT_PATH}/headers" "${INTERCEPT_CLIEN
2222

2323
if(USE_64BIT_BUILD)
2424
set(INTERCEPT_PLUGIN_NAME "${CMAKE_PROJECT_NAME}_x64" PARENT_SCOPE)
25+
set(INTERCEPT_PLUGIN_NAME "${CMAKE_PROJECT_NAME}_x64")
2526
else()
2627
set(INTERCEPT_PLUGIN_NAME "${CMAKE_PROJECT_NAME}" PARENT_SCOPE)
28+
set(INTERCEPT_PLUGIN_NAME "${CMAKE_PROJECT_NAME}")
2729
endif()
2830

2931
add_definitions(/DINTERCEPT_NO_THREAD_SAFETY)

src/connection.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "connection.h"
22
#include <mysqlx/xdevapi.h>
33
#include "query.h"
4-
#include "result.h"
4+
#include "res.h"
55

66
using namespace intercept::client;
77
using namespace mysqlx;

src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include <intercept.hpp>
22
//#include <mysqlx/xdevapi.h>
3-
#include "result.h"
3+
#include "res.h"
44
#include "query.h"
55
#include "connection.h"
66

src/result.cpp renamed to src/res.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "result.h"
1+
#include "res.h"
22
#include <mysqlx/xdevapi.h>
33

44
using namespace intercept::client;

src/result.h renamed to src/res.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
using namespace intercept;
55
using namespace intercept::types;
66

7+
//#TODO rename sourcefile to queryResult. Cannot use result.cpp because mysql connector already uses that
8+
79
class Result {
810
public:
911

0 commit comments

Comments
 (0)