From 2fc4bb34a11a71298dc76d3d8c021e1672b408e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Stresing?= Date: Fri, 20 Dec 2024 22:45:17 +0100 Subject: [PATCH 1/2] Increase version --- info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.json b/info.json index a789e8e..fcfeb54 100644 --- a/info.json +++ b/info.json @@ -1,7 +1,7 @@ { "version": { "major": 3, - "minor": 0, + "minor": 1, "patch": 0, "snapshot": true }, From ce2efc06de52d3d185d2a6043ec6e70d81e319ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Stresing?= Date: Sun, 22 Dec 2024 15:30:08 +0100 Subject: [PATCH 2/2] Fix ios build --- hostProfiles/androidArmv7.profile | 3 +-- hostProfiles/androidArmv8.profile | 3 +-- hostProfiles/androidx86.profile | 3 +-- hostProfiles/androidx86_64.profile | 3 +-- hostProfiles/iosArmv8.profile | 15 +++++++++++++++ info.json | 4 ++-- src/CMakeLists.txt | 2 +- 7 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 hostProfiles/iosArmv8.profile diff --git a/hostProfiles/androidArmv7.profile b/hostProfiles/androidArmv7.profile index ba5594d..5b2ddf6 100644 --- a/hostProfiles/androidArmv7.profile +++ b/hostProfiles/androidArmv7.profile @@ -6,9 +6,8 @@ compiler=clang compiler.version=17 compiler.libcxx=c++_shared build_type=Release -[options] -qt/*:opengl=es2 [tool_requires] +cmake/3.23.5 android-ndk/r26b@de.privatehive/stable android-sdk/latest@de.privatehive/stable openjdk/19.0.2@de.privatehive/stable diff --git a/hostProfiles/androidArmv8.profile b/hostProfiles/androidArmv8.profile index f20fda9..52296c0 100644 --- a/hostProfiles/androidArmv8.profile +++ b/hostProfiles/androidArmv8.profile @@ -6,9 +6,8 @@ compiler=clang compiler.version=17 compiler.libcxx=c++_shared build_type=Release -[options] -qt/*:opengl=es2 [tool_requires] +cmake/3.23.5 android-ndk/r26b@de.privatehive/stable android-sdk/latest@de.privatehive/stable openjdk/19.0.2@de.privatehive/stable diff --git a/hostProfiles/androidx86.profile b/hostProfiles/androidx86.profile index 4d94afa..900b23d 100644 --- a/hostProfiles/androidx86.profile +++ b/hostProfiles/androidx86.profile @@ -6,9 +6,8 @@ compiler=clang compiler.version=17 compiler.libcxx=c++_shared build_type=Release -[options] -qt/*:opengl=es2 [tool_requires] +cmake/3.23.5 android-ndk/r26b@de.privatehive/stable android-sdk/latest@de.privatehive/stable openjdk/19.0.2@de.privatehive/stable diff --git a/hostProfiles/androidx86_64.profile b/hostProfiles/androidx86_64.profile index 1c19ed4..ea232de 100644 --- a/hostProfiles/androidx86_64.profile +++ b/hostProfiles/androidx86_64.profile @@ -6,9 +6,8 @@ compiler=clang compiler.version=17 compiler.libcxx=c++_shared build_type=Release -[options] -qt/*:opengl=es2 [tool_requires] +cmake/3.23.5 android-ndk/r26b@de.privatehive/stable android-sdk/latest@de.privatehive/stable openjdk/19.0.2@de.privatehive/stable diff --git a/hostProfiles/iosArmv8.profile b/hostProfiles/iosArmv8.profile new file mode 100644 index 0000000..492ec6c --- /dev/null +++ b/hostProfiles/iosArmv8.profile @@ -0,0 +1,15 @@ +[settings] +os=iOS +os.version=18.2 +os.sdk=iphoneos +os.sdk_version=18.2 +arch=armv8 +compiler=apple-clang +compiler.cppstd=gnu17 +compiler.libcxx=libc++ +compiler.version=16 +build_type=Release +[options] +shared=False +[tool_requires] +cmake/3.23.5 diff --git a/info.json b/info.json index fcfeb54..20b9eaf 100644 --- a/info.json +++ b/info.json @@ -1,8 +1,8 @@ { "version": { "major": 3, - "minor": 1, - "patch": 0, + "minor": 0, + "patch": 1, "snapshot": true }, "projectName": "libONVIF", diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b53fb93..9945e81 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -555,7 +555,7 @@ install(TARGETS onvifevent onvifdisplay onvifanalytics - EXPORT libONVIFTargets RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib PUBLIC_HEADER DESTINATION include + EXPORT libONVIFTargets RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib PUBLIC_HEADER DESTINATION include BUNDLE DESTINATION . ) install(EXPORT libONVIFTargets DESTINATION cmake)