Skip to content

Commit 8b661fe

Browse files
lemirelemire
authored
Merge pull request simdjson#1001 from simdjson/dlemire/justlib_install
We do not properly test just library.
2 parents 6b85b9a + 077907b commit 8b661fe

File tree

7 files changed

+23
-13
lines changed

7 files changed

+23
-13
lines changed

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ jobs:
121121
justlib-gcc10:
122122
description: Build just the library, install it and do a basic test
123123
executor: gcc10
124-
environment: { CMAKE_FLAGS: -SIMDJSON_JUST_LIBRARY=ON }
124+
environment: { CMAKE_FLAGS: -DSIMDJSON_JUST_LIBRARY=ON }
125125
steps: [ cmake_build, cmake_install_test ]
126126
gcc10:
127127
description: Build and run tests on GCC 10 and AVX 2 with a cmake static build, this test performance regression

‎CMakeLists.txt‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,15 @@ project(simdjson
77

88
set(PROJECT_VERSION_MAJOR 0)
99
set(PROJECT_VERSION_MINOR 4)
10-
set(PROJECT_VERSION_PATCH 1)
11-
set(SIMDJSON_LIB_VERSION "0.4.1" CACHE STRING "simdjson library version")
10+
set(PROJECT_VERSION_PATCH 2)
11+
set(SIMDJSON_LIB_VERSION "0.4.2" CACHE STRING "simdjson library version")
1212
set(SIMDJSON_LIB_SOVERSION "2" CACHE STRING "simdjson library soversion")
1313
set(SIMDJSON_GITHUB_REPOSITORY https://github.com/simdjson/simdjson)
1414

15+
# The SIMDJSON_LIB_SOVERSION is 0 for versions before 0.3.0.
16+
# The SIMDJSON_LIB_SOVERSION is 1 for version 0.3.
17+
# The SIMDJSON_LIB_SOVERSION is 2 for version 0.4.
18+
1519
include(GNUInstallDirs)
1620
include(cmake/simdjson-flags.cmake)
1721
include(cmake/simdjson-user-cmakecache.cmake)
@@ -43,8 +47,8 @@ add_subdirectory(windows)
4347
if(NOT(SIMDJSON_JUST_LIBRARY))
4448
add_subdirectory(dependencies) ## This needs to be before tools because of cxxopts
4549
add_subdirectory(tools) ## This needs to be before tests because of cxxopts
46-
add_subdirectory(singleheader)
4750
endif()
51+
add_subdirectory(singleheader)
4852

4953
#
5054
# Compile tools / tests / benchmarks

‎Doxyfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = simdjson
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = "0.4.1"
41+
PROJECT_NUMBER = "0.4.2"
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

‎include/simdjson/simdjson_version.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#define SIMDJSON_SIMDJSON_VERSION_H
55

66
/** The version of simdjson being used (major.minor.revision) */
7-
#define SIMDJSON_VERSION 0.4.1
7+
#define SIMDJSON_VERSION 0.4.2
88

99
namespace simdjson {
1010
enum {
@@ -19,7 +19,7 @@ enum {
1919
/**
2020
* The revision (major.minor.REVISION) of simdjson being used.
2121
*/
22-
SIMDJSON_VERSION_REVISION = 1
22+
SIMDJSON_VERSION_REVISION = 2
2323
};
2424
} // namespace simdjson
2525

‎singleheader/amalgamate_demo.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* auto-generated on Fri 26 Jun 2020 20:03:28 EDT. Do not edit! */
1+
/* auto-generated on Sun 28 Jun 2020 12:39:28 EDT. Do not edit! */
22

33
#include <iostream>
44
#include "simdjson.h"

‎singleheader/simdjson.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* auto-generated on Fri 26 Jun 2020 20:03:28 EDT. Do not edit! */
1+
/* auto-generated on Sun 28 Jun 2020 12:39:28 EDT. Do not edit! */
22
/* begin file src/simdjson.cpp */
33
#include "simdjson.h"
44

‎singleheader/simdjson.h‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* auto-generated on Fri 26 Jun 2020 20:03:28 EDT. Do not edit! */
1+
/* auto-generated on Sun 28 Jun 2020 12:39:28 EDT. Do not edit! */
22
/* begin file include/simdjson.h */
33
#ifndef SIMDJSON_H
44
#define SIMDJSON_H
@@ -190,7 +190,6 @@ use a 64-bit target such as x64 or 64-bit ARM.")
190190
#endif
191191
#endif
192192
193-
194193
// workaround for large stack sizes under -O0.
195194
// https://github.com/simdjson/simdjson/issues/691
196195
#ifdef __APPLE__
@@ -204,6 +203,13 @@ use a 64-bit target such as x64 or 64-bit ARM.")
204203
#endif
205204
#endif
206205
206+
207+
#if SIMDJSON_DO_NOT_USE_THREADS_NO_MATTER_WHAT
208+
// No matter what happened, we undefine SIMDJSON_THREADS_ENABLED and so disable threads.
209+
#undef SIMDJSON_THREADS_ENABLED
210+
#endif
211+
212+
207213
#if defined(__clang__)
208214
#define NO_SANITIZE_UNDEFINED __attribute__((no_sanitize("undefined")))
209215
#elif defined(__GNUC__)
@@ -2032,7 +2038,7 @@ SIMDJSON_DISABLE_UNDESIRED_WARNINGS
20322038
#define SIMDJSON_SIMDJSON_VERSION_H
20332039
20342040
/** The version of simdjson being used (major.minor.revision) */
2035-
#define SIMDJSON_VERSION 0.4.1
2041+
#define SIMDJSON_VERSION 0.4.2
20362042
20372043
namespace simdjson {
20382044
enum {
@@ -2047,7 +2053,7 @@ enum {
20472053
/**
20482054
* The revision (major.minor.REVISION) of simdjson being used.
20492055
*/
2050-
SIMDJSON_VERSION_REVISION = 1
2056+
SIMDJSON_VERSION_REVISION = 2
20512057
};
20522058
} // namespace simdjson
20532059

0 commit comments

Comments
 (0)