Merge branch 'dev'

Privatehive · Dec 22, 2024 · b0273c9 · b0273c9
2 parents b418858 + ce2efc0
commit b0273c9
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -2,7 +2,7 @@
   "version": {
     "major": 3,
     "minor": 0,
-    "patch": 0,
+    "patch": 1,
     "snapshot": false
   },
   "projectName": "libONVIF",

diff --git 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)