Skip to content

Commit 0ef4d90

Browse files
lemireDaniel Lemire
lemire
and
Daniel Lemire
authored
Fix for issue 1014. (simdjson#1015)
* Fix for issue 1014. * Explanation. Co-authored-by: Daniel Lemire <lemire@gmai.com>
1 parent 1a1e7ed commit 0ef4d90

File tree

8 files changed

+37
-11
lines changed

8 files changed

+37
-11
lines changed

‎CMakeLists.txt

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

88
set(PROJECT_VERSION_MAJOR 0)
99
set(PROJECT_VERSION_MINOR 4)
10-
set(PROJECT_VERSION_PATCH 4)
11-
set(SIMDJSON_LIB_VERSION "0.4.4" CACHE STRING "simdjson library version")
10+
set(PROJECT_VERSION_PATCH 5)
11+
set(SIMDJSON_LIB_VERSION "0.4.5" 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

‎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.4"
41+
PROJECT_NUMBER = "0.4.5"
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.4
7+
#define SIMDJSON_VERSION 0.4.5
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 = 4
22+
SIMDJSON_VERSION_REVISION = 5
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 Tue 30 Jun 2020 09:41:13 EDT. Do not edit! */
1+
/* auto-generated on Tue Jun 30 19:29:34 EDT 2020. 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 Tue 30 Jun 2020 09:41:13 EDT. Do not edit! */
1+
/* auto-generated on Tue Jun 30 19:29:34 EDT 2020. Do not edit! */
22
/* begin file src/simdjson.cpp */
33
#include "simdjson.h"
44

‎singleheader/simdjson.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* auto-generated on Tue 30 Jun 2020 09:41:13 EDT. Do not edit! */
1+
/* auto-generated on Tue Jun 30 19:29:34 EDT 2020. Do not edit! */
22
/* begin file include/simdjson.h */
33
#ifndef SIMDJSON_H
44
#define SIMDJSON_H
@@ -2040,7 +2040,7 @@ SIMDJSON_DISABLE_UNDESIRED_WARNINGS
20402040
#define SIMDJSON_SIMDJSON_VERSION_H
20412041
20422042
/** The version of simdjson being used (major.minor.revision) */
2043-
#define SIMDJSON_VERSION 0.4.4
2043+
#define SIMDJSON_VERSION 0.4.5
20442044
20452045
namespace simdjson {
20462046
enum {
@@ -2055,7 +2055,7 @@ enum {
20552055
/**
20562056
* The revision (major.minor.REVISION) of simdjson being used.
20572057
*/
2058-
SIMDJSON_VERSION_REVISION = 4
2058+
SIMDJSON_VERSION_REVISION = 5
20592059
};
20602060
} // namespace simdjson
20612061

‎src/CMakeLists.txt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,17 @@ if(NOT MSVC)
7878
## We output the library at the root of the current directory where cmake is invoked
7979
## This is handy but Visual Studio will happily ignore us
8080
set_target_properties(simdjson PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
81-
MESSAGE( STATUS "Library output directory (does not apply to Visual Studio): " ${PROJECT_BINARY_DIR})
81+
MESSAGE( STATUS "Library output directory: " ${PROJECT_BINARY_DIR})
82+
83+
############
84+
# Please do not delete the following, our users want version numbers. See
85+
# https://github.com/simdjson/simdjson/issues/1014
86+
# https://github.com/simdjson/simdjson/issues/52
87+
###########
88+
set_target_properties(simdjson PROPERTIES VERSION ${SIMDJSON_LIB_VERSION} SOVERSION ${SIMDJSON_LIB_SOVERSION})
89+
##########
90+
# End of the do-not-delete message.
91+
#########
8292
endif()
8393

8494
#

‎tests/CMakeLists.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,4 +177,20 @@ endif()
177177
# target_link_libraries(singleheader simdjson simdjson-flags)
178178
# add_test(singleheader singleheader)
179179

180+
if(NOT MSVC)
181+
######
182+
# This tests is to guard us against ever again removing the soversion
183+
# and version numbers from the library. See Bug
184+
# https://github.com/simdjson/simdjson/issues/1014
185+
#####
186+
get_target_property(REPORTED_SIMDJSON_VERSION simdjson VERSION)
187+
get_target_property(REPORTED_SIMDJSON_SOVERSION simdjson SOVERSION)
188+
if(NOT ${REPORTED_SIMDJSON_VERSION} STREQUAL ${SIMDJSON_LIB_VERSION})
189+
message(FATAL_ERROR "The library target does not have the proper version information." )
190+
endif()
191+
if(NOT ${REPORTED_SIMDJSON_SOVERSION} STREQUAL ${SIMDJSON_LIB_SOVERSION})
192+
message(FATAL_ERROR "The library target does not have the proper soversion information." )
193+
endif()
194+
endif()
195+
180196
add_subdirectory(compilation_failure_tests)

0 commit comments

Comments
 (0)