Skip to content

Commit 9747c63

Browse files
jm4Rkenneth-jia
jm4R
authored and
kenneth-jia
committed
Make the project more ExternalProject-friendly
1 parent 1becf27 commit 9747c63

27 files changed

+117
-104
lines changed

‎CMakeLists.txt

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@ cmake_minimum_required(VERSION "3.8")
22

33
project("Modern C++ Kafka API" VERSION 1.0.0)
44

5-
include(CTest)
5+
get_property(parent_directory DIRECTORY PROPERTY PARENT_DIRECTORY)
6+
if(NOT parent_directory)
7+
set(cppkafka_master_project ON)
8+
endif()
9+
10+
option(CPPKAFKA_ENABLE_TESTS "Generate the test targets" ${cppkafka_master_project})
11+
612
include(CheckCXXCompilerFlag)
713
include(CMakePushCheckState)
814

@@ -250,7 +256,14 @@ else ()
250256
endif ()
251257

252258
add_subdirectory("include")
253-
add_subdirectory("tests")
254-
add_subdirectory("tools")
255-
add_subdirectory("examples")
259+
260+
if (CPPKAFKA_ENABLE_TESTS)
261+
include(CTest)
262+
add_subdirectory("tests")
263+
endif()
264+
265+
if (cppkafka_master_project)
266+
add_subdirectory("tools")
267+
add_subdirectory("examples")
268+
endif()
256269
endif ()

‎include/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ project(modern-cpp-kafka-api)
22

33
add_library(${PROJECT_NAME} INTERFACE)
44

5-
target_include_directories(${PROJECT_NAME} INTERFACE "./")
5+
target_include_directories(${PROJECT_NAME} INTERFACE ${CMAKE_CURRENT_LIST_DIR})
66

77
#---------------------------
88
# librdkafka

‎include/kafka/AdminClient.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#pragma once
22

3-
#include "kafka/Project.h"
3+
#include <kafka/Project.h>
44

5-
#include "kafka/AdminClientConfig.h"
6-
#include "kafka/AdminCommon.h"
7-
#include "kafka/Error.h"
8-
#include "kafka/KafkaClient.h"
9-
#include "kafka/RdKafkaHelper.h"
5+
#include <kafka/AdminClientConfig.h>
6+
#include <kafka/AdminCommon.h>
7+
#include <kafka/Error.h>
8+
#include <kafka/KafkaClient.h>
9+
#include <kafka/RdKafkaHelper.h>
1010

11-
#include "librdkafka/rdkafka.h"
11+
#include <librdkafka/rdkafka.h>
1212

1313
#include <array>
1414
#include <cassert>

‎include/kafka/AdminClientConfig.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
22

3-
#include "kafka/Project.h"
3+
#include <kafka/Project.h>
44

5-
#include "kafka/Properties.h"
5+
#include <kafka/Properties.h>
66

77

88
namespace KAFKA_API::clients::admin {

‎include/kafka/AdminCommon.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#pragma once
22

3-
#include "kafka/Project.h"
3+
#include <kafka/Project.h>
44

5-
#include "kafka/Error.h"
6-
#include "kafka/Types.h"
5+
#include <kafka/Error.h>
6+
#include <kafka/Types.h>
77

88

99
namespace KAFKA_API::clients::admin {

‎include/kafka/BrokerMetadata.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#pragma once
22

3-
#include "kafka/Project.h"
3+
#include <kafka/Project.h>
44

5-
#include "kafka/KafkaException.h"
6-
#include "kafka/Types.h"
5+
#include <kafka/KafkaException.h>
6+
#include <kafka/Types.h>
77

8-
#include "librdkafka/rdkafka.h"
8+
#include <librdkafka/rdkafka.h>
99

1010
#include <map>
1111
#include <vector>

‎include/kafka/ConsumerCommon.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#pragma once
22

3-
#include "kafka/Project.h"
3+
#include <kafka/Project.h>
44

5-
#include "kafka/Error.h"
6-
#include "kafka/RdKafkaHelper.h"
7-
#include "kafka/Types.h"
5+
#include <kafka/Error.h>
6+
#include <kafka/RdKafkaHelper.h>
7+
#include <kafka/Types.h>
88

9-
#include "librdkafka/rdkafka.h"
9+
#include <librdkafka/rdkafka.h>
1010

1111
#include <functional>
1212

‎include/kafka/ConsumerConfig.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
22

3-
#include "kafka/Project.h"
3+
#include <kafka/Project.h>
44

5-
#include "kafka/Properties.h"
5+
#include <kafka/Properties.h>
66

77

88
namespace KAFKA_API::clients::consumer {

‎include/kafka/ConsumerRecord.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#pragma once
22

3-
#include "kafka/Project.h"
3+
#include <kafka/Project.h>
44

5-
#include "kafka/Error.h"
6-
#include "kafka/Header.h"
7-
#include "kafka/Timestamp.h"
8-
#include "kafka/Types.h"
5+
#include <kafka/Error.h>
6+
#include <kafka/Header.h>
7+
#include <kafka/Timestamp.h>
8+
#include <kafka/Types.h>
99

10-
#include "librdkafka/rdkafka.h"
10+
#include <librdkafka/rdkafka.h>
1111

1212
#include <sstream>
1313

‎include/kafka/Error.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#pragma once
22

3-
#include "kafka/Project.h"
3+
#include <kafka/Project.h>
44

5-
#include "kafka/RdKafkaHelper.h"
5+
#include <kafka/RdKafkaHelper.h>
66

7-
#include "librdkafka/rdkafka.h"
7+
#include <librdkafka/rdkafka.h>
88

99
#include <string>
1010
#include <system_error>

‎include/kafka/Header.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
22

3-
#include "kafka/Project.h"
3+
#include <kafka/Project.h>
44

5-
#include "kafka/Types.h"
5+
#include <kafka/Types.h>
66

77
#include <algorithm>
88
#include <string>

‎include/kafka/KafkaClient.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
#pragma once
22

3-
#include "kafka/Project.h"
3+
#include <kafka/Project.h>
44

5-
#include "kafka/BrokerMetadata.h"
6-
#include "kafka/Error.h"
7-
#include "kafka/KafkaException.h"
8-
#include "kafka/Log.h"
9-
#include "kafka/Properties.h"
10-
#include "kafka/RdKafkaHelper.h"
11-
#include "kafka/Types.h"
5+
#include <kafka/BrokerMetadata.h>
6+
#include <kafka/Error.h>
7+
#include <kafka/KafkaException.h>
8+
#include <kafka/Log.h>
9+
#include <kafka/Properties.h>
10+
#include <kafka/RdKafkaHelper.h>
11+
#include <kafka/Types.h>
1212

13-
#include "librdkafka/rdkafka.h"
13+
#include <librdkafka/rdkafka.h>
1414

1515
#include <atomic>
1616
#include <cassert>

‎include/kafka/KafkaConsumer.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#pragma once
22

3-
#include "kafka/Project.h"
3+
#include <kafka/Project.h>
44

5-
#include "kafka/ConsumerCommon.h"
6-
#include "kafka/ConsumerConfig.h"
7-
#include "kafka/ConsumerRecord.h"
8-
#include "kafka/Error.h"
9-
#include "kafka/KafkaClient.h"
5+
#include <kafka/ConsumerCommon.h>
6+
#include <kafka/ConsumerConfig.h>
7+
#include <kafka/ConsumerRecord.h>
8+
#include <kafka/Error.h>
9+
#include <kafka/KafkaClient.h>
1010

11-
#include "librdkafka/rdkafka.h"
11+
#include <librdkafka/rdkafka.h>
1212

1313
#include <algorithm>
1414
#include <cassert>

‎include/kafka/KafkaException.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#pragma once
22

3-
#include "kafka/Project.h"
3+
#include <kafka/Project.h>
44

5-
#include "kafka/Error.h"
6-
#include "kafka/RdKafkaHelper.h"
7-
#include "kafka/Utility.h"
5+
#include <kafka/Error.h>
6+
#include <kafka/RdKafkaHelper.h>
7+
#include <kafka/Utility.h>
88

9-
#include "librdkafka/rdkafka.h"
9+
#include <librdkafka/rdkafka.h>
1010

1111
#include <chrono>
1212
#include <exception>

‎include/kafka/KafkaProducer.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
#pragma once
22

3-
#include "kafka/Project.h"
3+
#include <kafka/Project.h>
44

5-
#include "kafka/ConsumerCommon.h"
6-
#include "kafka/KafkaClient.h"
7-
#include "kafka/ProducerCommon.h"
8-
#include "kafka/ProducerConfig.h"
9-
#include "kafka/ProducerRecord.h"
10-
#include "kafka/Timestamp.h"
11-
#include "kafka/Types.h"
5+
#include <kafka/ConsumerCommon.h>
6+
#include <kafka/KafkaClient.h>
7+
#include <kafka/ProducerCommon.h>
8+
#include <kafka/ProducerConfig.h>
9+
#include <kafka/ProducerRecord.h>
10+
#include <kafka/Timestamp.h>
11+
#include <kafka/Types.h>
1212

13-
#include "librdkafka/rdkafka.h"
13+
#include <librdkafka/rdkafka.h>
1414

1515
#include <cassert>
1616
#include <condition_variable>

‎include/kafka/Log.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
22

3-
#include "kafka/Project.h"
3+
#include <kafka/Project.h>
44

5-
#include "kafka/Utility.h"
5+
#include <kafka/Utility.h>
66

77
#include <cassert>
88
#include <functional>

‎include/kafka/ProducerCommon.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#pragma once
22

3-
#include "kafka/Project.h"
3+
#include <kafka/Project.h>
44

5-
#include "kafka/ProducerRecord.h"
6-
#include "kafka/RdKafkaHelper.h"
7-
#include "kafka/Timestamp.h"
8-
#include "kafka/Types.h"
5+
#include <kafka/ProducerRecord.h>
6+
#include <kafka/RdKafkaHelper.h>
7+
#include <kafka/Timestamp.h>
8+
#include <kafka/Types.h>
99

10-
#include "librdkafka/rdkafka.h"
10+
#include <librdkafka/rdkafka.h>
1111

1212
#include <functional>
1313
#include <memory>

‎include/kafka/ProducerConfig.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
22

3-
#include "kafka/Project.h"
3+
#include <kafka/Project.h>
44

5-
#include "kafka/Types.h"
5+
#include <kafka/Types.h>
66

77

88
namespace KAFKA_API::clients::producer {

‎include/kafka/ProducerRecord.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#pragma once
22

3-
#include "kafka/Project.h"
3+
#include <kafka/Project.h>
44

5-
#include "kafka/Header.h"
6-
#include "kafka/Types.h"
5+
#include <kafka/Header.h>
6+
#include <kafka/Types.h>
77

8-
#include "librdkafka/rdkafka.h"
8+
#include <librdkafka/rdkafka.h>
99

1010

1111
namespace KAFKA_API::clients::producer {

‎include/kafka/Properties.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
22

3-
#include "kafka/Project.h"
3+
#include <kafka/Project.h>
44

5-
#include "kafka/Types.h"
5+
#include <kafka/Types.h>
66

77
#include <algorithm>
88
#include <map>

‎include/kafka/RdKafkaHelper.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#pragma once
22

3-
#include "kafka/Project.h"
3+
#include <kafka/Project.h>
44

5-
#include "kafka/Types.h"
5+
#include <kafka/Types.h>
66

7-
#include "librdkafka/rdkafka.h"
7+
#include <librdkafka/rdkafka.h>
88

99
#include <memory>
1010

‎include/kafka/Timestamp.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
22

3-
#include "kafka/Project.h"
3+
#include <kafka/Project.h>
44

5-
#include "librdkafka/rdkafka.h"
5+
#include <librdkafka/rdkafka.h>
66

77
#include <cassert>
88
#include <chrono>

‎include/kafka/Types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include "kafka/Project.h"
3+
#include <kafka/Project.h>
44

55
#include <algorithm>
66
#include <cctype>

‎include/kafka/Utility.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
22

3-
#include "kafka/Project.h"
3+
#include <kafka/Project.h>
44

5-
#include "librdkafka/rdkafka.h"
5+
#include <librdkafka/rdkafka.h>
66

77
#include <chrono>
88
#include <iomanip>

‎include/kafka/addons/KafkaMetrics.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#pragma once
22

3-
#include "kafka/Project.h"
3+
#include <kafka/Project.h>
44

55
// https://github.com/Tencent/rapidjson/releases/tag/v1.1.0
6-
#include "rapidjson/document.h"
7-
#include "rapidjson/stringbuffer.h"
8-
#include "rapidjson/writer.h"
6+
#include <rapidjson/document.h>
7+
#include <rapidjson/stringbuffer.h>
8+
#include <rapidjson/writer.h>
99

1010
#include <algorithm>
1111
#include <iostream>

0 commit comments

Comments
 (0)