Skip to content

Commit 901e3b7

Browse files
authored
openjph: Bump to version 0.23.1 (#28396)
1 parent f229ecb commit 901e3b7

File tree

4 files changed

+44
-39
lines changed

4 files changed

+44
-39
lines changed

recipes/openjph/all/conandata.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
sources:
2-
"0.22.0":
3-
url: "https://github.com/aous72/OpenJPH/archive/0.22.0.tar.gz"
4-
sha256: "c9c6e9ec82ee8770ede41eeffe8acaab1814724c698b258c3de160dc09cb7d12"
2+
"0.23.1":
3+
url: "https://github.com/aous72/OpenJPH/archive/0.23.1.tar.gz"
4+
sha256: "8a0357075fb92feeaa36e23de78f81a869c7bb6189091cc34f41bb061c1db22b"
55
patches:
6-
"0.22.0":
7-
- patch_file: "patches/0.22.0-cmake-cxx-standard-fpic.patch"
8-
patch_description: "Remove setting of CXX standard to a fixed value overriding the toolchain provided by Conan and fPIC hardcoded option"
6+
"0.23.1":
7+
- patch_file: "patches/0.23.1-cmake-cxx-standard-pic.patch"
8+
patch_description: "Remove setting of CXX standard to a fixed value overriding the toolchain provided by Conan and PIC hardcoded option"
99
patch_type: "conan"

recipes/openjph/all/patches/0.22.0-cmake-cxx-standard-fpic.patch

Lines changed: 0 additions & 32 deletions
This file was deleted.
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
diff --git CMakeLists.txt CMakeLists.txt
2+
index cb6abda..3eea032 100644
3+
--- CMakeLists.txt
4+
+++ CMakeLists.txt
5+
@@ -119,7 +119,6 @@ message(STATUS "Building ${CMAKE_BUILD_TYPE}")
6+
7+
## C++ version and flags
8+
# C++14 is needed for gtest, otherwise, C++11 is sufficient for the library
9+
-set(CMAKE_CXX_STANDARD 14)
10+
if (MSVC)
11+
add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
12+
endif()
13+
diff --git src/apps/ojph_stream_expand/CMakeLists.txt src/apps/ojph_stream_expand/CMakeLists.txt
14+
index 61e8603..65be4a3 100644
15+
--- src/apps/ojph_stream_expand/CMakeLists.txt
16+
+++ src/apps/ojph_stream_expand/CMakeLists.txt
17+
@@ -1,7 +1,6 @@
18+
## building ojph_stream_expand
19+
##############################
20+
21+
-set(CMAKE_CXX_STANDARD 14)
22+
23+
file(GLOB OJPH_STREAM_EXPAND "*.cpp" "*.h")
24+
file(GLOB OJPH_SOCKETS "../others/ojph_sockets.cpp")
25+
diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
26+
index ea19aea..132a619 100644
27+
--- src/core/CMakeLists.txt
28+
+++ src/core/CMakeLists.txt
29+
@@ -135,7 +135,7 @@ if (BUILD_SHARED_LIBS AND WIN32)
30+
endif()
31+
32+
## include library version/name
33+
-set_target_properties(openjph PROPERTIES POSITION_INDEPENDENT_CODE ON)
34+
+#set_target_properties(openjph PROPERTIES POSITION_INDEPENDENT_CODE ON)
35+
target_compile_definitions(openjph PUBLIC _FILE_OFFSET_BITS=64)
36+
target_include_directories(openjph PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/common> $<INSTALL_INTERFACE:include>)
37+

recipes/openjph/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
versions:
2-
"0.22.0":
2+
"0.23.1":
33
folder: all

0 commit comments

Comments
 (0)