Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions recipes/openjph/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
sources:
"0.24.1":
url: "https://github.com/aous72/OpenJPH/archive/0.24.1.tar.gz"
sha256: "5e44a809c9ee3dad175da839feaf66746cfc114a625ec61c786de8ad3f5ab472"
"0.24.2":
url: "https://github.com/aous72/OpenJPH/archive/0.24.2.tar.gz"
sha256: "c99218752b15b5b2afca3b0e4d4f0ddf1ac19f94dbcbe11874fe492d44ed3e2d"
patches:
"0.24.1":
- patch_file: "patches/0.24.1-cmake-cxx-standard-pic.patch"
"0.24.2":
- patch_file: "patches/0.24.2-cmake-cxx-standard-pic.patch"
patch_description: "Remove setting of CXX standard to a fixed value overriding the toolchain provided by Conan and PIC hardcoded option"
patch_type: "conan"
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
diff --git src/apps/ojph_stream_expand/CMakeLists.txt src/apps/ojph_stream_expand/CMakeLists.txt
index 61e8603..85c1d99 100644
--- src/apps/ojph_stream_expand/CMakeLists.txt
+++ src/apps/ojph_stream_expand/CMakeLists.txt
@@ -1,7 +1,7 @@
## building ojph_stream_expand
##############################

-set(CMAKE_CXX_STANDARD 14)
+#set(CMAKE_CXX_STANDARD 14)

file(GLOB OJPH_STREAM_EXPAND "*.cpp" "*.h")
file(GLOB OJPH_SOCKETS "../others/ojph_sockets.cpp")
diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
index ea19aea..132a619 100644
--- src/core/CMakeLists.txt
Expand Down
2 changes: 1 addition & 1 deletion recipes/openjph/config.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
versions:
"0.24.1":
"0.24.2":
folder: all