copy the pattern used for dnnl - declare opencl-platform dependency

Author: barrypitman

ffmpeg/pom.xml

@@ -40,33 +40,45 @@
         <dependencies>
           <dependency>
             <groupId>org.bytedeco</groupId>
-            <artifactId>opencl</artifactId>
+            <artifactId>opencl-platform</artifactId>
             <version>3.1-${project.parent.version}</version>
           </dependency>
-          <dependency>
-            <groupId>org.bytedeco</groupId>
-            <artifactId>opencl</artifactId>
-            <version>3.1-${project.parent.version}</version>
-            <classifier>${javacpp.platform}</classifier>
-          </dependency>
         </dependencies>
         <configuration>
           <classPaths>
+            <classPath>${basedir}/../opencl/target/classes/</classPath>
             <classPath>${project.build.outputDirectory}</classPath>
           </classPaths>
           <includePaths>
+            <includePath>${basedir}/../opencl/target/classes/org/bytedeco/opencl/include/</includePath>
+            <includePath>${basedir}/../opencl/src/main/resources/org/bytedeco/opencl/include/</includePath>
+            <includePath>${basedir}/../opencl/cppbuild/${javacpp.platform}/include/</includePath>
             <includePath>${basedir}/src/main/resources/org/bytedeco/ffmpeg/include/</includePath>
             <includePath>${basedir}/cppbuild/${javacpp.platform}${javacpp.platform.extension}/include/</includePath>
-            <includePath>${project.build.directory}/opencl/org/bytedeco/opencl/${javacpp.platform}/include/</includePath>
           </includePaths>
           <linkPaths>
+            <linkPath>${basedir}/../opencl/cppbuild/${javacpp.platform}/lib/</linkPath>
             <linkPath>${basedir}/cppbuild/${javacpp.platform}${javacpp.platform.extension}/lib/</linkPath>
-            <linkPath>${project.build.directory}/opencl/org/bytedeco/opencl/${javacpp.platform}/lib/</linkPath>
           </linkPaths>
           <preloadPaths>
+            <preloadPath>${basedir}/../opencl/cppbuild/${javacpp.platform}/bin/</preloadPath>
             <preloadPath>${basedir}/cppbuild/${javacpp.platform}${javacpp.platform.extension}/bin/</preloadPath>
-            <preloadPath>${project.build.directory}/opencl/org/bytedeco/opencl/${javacpp.platform}/</preloadPath>
           </preloadPaths>
+          <buildResources>
+            <buildResource>/${javacpp.platform.library.path}/</buildResource>
+            <buildResource>/org/bytedeco/opencl/${javacpp.platform}/</buildResource>
+          </buildResources>
+          <includeResources>
+            <includeResource>/${javacpp.platform.library.path}/include/</includeResource>
+            <includeResource>/org/bytedeco/opencl/include/</includeResource>
+            <includeResource>/org/bytedeco/opencl/${javacpp.platform}/include/</includeResource>
+          </includeResources>
+          <linkResources>
+            <linkResource>/${javacpp.platform.library.path}/</linkResource>
+            <linkResource>/${javacpp.platform.library.path}/lib/</linkResource>
+            <linkResource>/org/bytedeco/opencl/${javacpp.platform}/</linkResource>
+            <linkResource>/org/bytedeco/opencl/${javacpp.platform}/lib/</linkResource>
+          </linkResources>
           <resourcePaths>
             <resourcePath>${basedir}/cppbuild/${javacpp.platform}${javacpp.platform.extension}/</resourcePath>
           </resourcePaths>
@@ -81,27 +93,6 @@
       </plugin>
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack-opencl</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.bytedeco</groupId>
-                  <artifactId>opencl</artifactId>
-                  <version>3.1-${project.parent.version}</version>
-                  <classifier>${javacpp.platform}</classifier>
-                  <type>jar</type>
-                  <outputDirectory>${project.build.directory}/opencl</outputDirectory>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
       </plugin>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>