Skip to content

Commit 4ed4044

Browse files
committed
Updated unit-tests
1 parent 3182b15 commit 4ed4044

File tree

5 files changed

+21
-13
lines changed

5 files changed

+21
-13
lines changed

unit-tests.wsjcpp/.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
tmp/*
22
logs/*
3-
unit-tests
3+
unit-tests
4+

unit-tests.wsjcpp/.gitkeeper

Whitespace-only changes.

unit-tests.wsjcpp/CMakeLists.txt

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1+
# Automaticly generated by wsjcpp@v0.0.1
12
cmake_minimum_required(VERSION 3.0)
23

34
project(unit-tests)
45

6+
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
7+
set(MACOSX TRUE)
8+
endif()
9+
510
set(CMAKE_CXX_STANDARD 11)
611
set(EXECUTABLE_OUTPUT_PATH ${unit-tests_SOURCE_DIR})
712

813
set (WSJCPP_LIBRARIES "")
914
set (WSJCPP_INCLUDE_DIRS "")
1015
set (WSJCPP_SOURCES "")
1116

12-
# Sources
13-
1417
# wsjcpp-core:v0.0.4
1518
list (APPEND WSJCPP_INCLUDE_DIRS "../src.wsjcpp/wsjcpp_core/")
1619
list (APPEND WSJCPP_SOURCES "../src.wsjcpp/wsjcpp_core/wsjcpp_core.cpp")
@@ -19,21 +22,23 @@ list (APPEND WSJCPP_SOURCES "../src.wsjcpp/wsjcpp_core/unit_tests.cpp")
1922
list (APPEND WSJCPP_SOURCES "../src.wsjcpp/wsjcpp_core/unit_tests.h")
2023
list (APPEND WSJCPP_SOURCES "../src.wsjcpp/wsjcpp_core/unit_tests_main.cpp")
2124

22-
# nlohmann/json
25+
# nlohmann/json:v3.7.3
2326
list (APPEND WSJCPP_INCLUDE_DIRS "../src.wsjcpp/nlohmann_json/")
2427
list (APPEND WSJCPP_SOURCES "../src.wsjcpp/nlohmann_json/json.hpp")
2528

26-
# wsjcpp-yaml
27-
list (APPEND WSJCPP_SOURCES "../src/wsjcpp_geoip.h")
29+
# wsjcpp-geoip:v0.0.1
30+
list (APPEND WSJCPP_INCLUDE_DIRS "../src")
2831
list (APPEND WSJCPP_SOURCES "../src/wsjcpp_geoip.cpp")
32+
list (APPEND WSJCPP_SOURCES "../src/wsjcpp_geoip.h")
2933

30-
# include header dirs
31-
list (APPEND WSJCPP_INCLUDE_DIRS "../src")
34+
# unit-tests
3235
list (APPEND WSJCPP_INCLUDE_DIRS "src")
33-
3436
list (APPEND WSJCPP_SOURCES "./src/unit_test_parser_ip_api_com.h")
3537
list (APPEND WSJCPP_SOURCES "./src/unit_test_parser_ip_api_com.cpp")
3638

39+
# required-libraries
40+
list (APPEND WSJCPP_LIBRARIES "-lpthread")
41+
3742
# required-pkg-config
3843
## CURL
3944
FIND_PACKAGE(CURL)
@@ -56,4 +61,5 @@ install(
5661
"unit-tests"
5762
RUNTIME DESTINATION
5863
/usr/bin
59-
)
64+
)
65+

unit-tests.wsjcpp/build_simple.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ fi
66

77
cd tmp
88
cmake ..
9-
make
9+
make
10+

wsjcpp.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ distribution:
4141
- source-file: "src/wsjcpp_geoip.cpp"
4242
target-file: "wsjcpp_geoip.cpp"
4343
type: "source-code"
44-
sha1: "242df088d637aca49912952bb5474a26aa4f352d"
44+
sha1: "e2224f330995487bfa0a643a24e2772d9d9d94cc"
4545
- source-file: "src/wsjcpp_geoip.h"
4646
target-file: "wsjcpp_geoip.h"
4747
type: "source-code"
48-
sha1: "739d22dcb6a4c3b8c896568f8a45366d68e8bdbb"
48+
sha1: "b067fb17b5370fb12aea405a844234bf45735cac"

0 commit comments

Comments
 (0)