Skip to content

Commit

Permalink
CI Win Cineform: do not copy .pc file
Browse files Browse the repository at this point in the history
After previous commit, UG configure finds the .pc file because
the file was copied incorrectly before - it is copied to
/usr/local/lib/pkgconfig, which was perhaps not a directory, creating
file _named_ pkgconfig instead the file inside that dir. Interestingly
this didn't look like it influenced other libraries, that might also
want to copy its files to something, that was then file.

But the contents is not usable without adjustnments:
1. prefix is C:/Program Files/CineFormSDK
2. lib is set to -lCFHDCodecShared in the PC file, but generated
library has name just CFHDCodec (something similar as already solved
by 0001-CMakeList.txt-remove-output-lib-name-force-UNIX.patch)

While the pkg-config file was not used previously, it is perhaps easiest
to leave it as it used to be instead of trying to fix the .pc file.
  • Loading branch information
MartinPulec committed Nov 16, 2023
1 parent 424d62e commit c173178
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/scripts/Windows/install_cineform.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ build() {(
)}

install() {(
mkdir -p /usr/local/bin /usr/local/include /usr/local/lib/pkgconfig
mkdir -p /usr/local/bin /usr/local/include /usr/local/lib
cd /c/cineform-sdk/build
cp Release/CFHDCodec.dll /usr/local/bin/
cp Release/CFHDCodec.lib /usr/local/lib/
cp ../Common/* /usr/local/include/
cp libcineformsdk.pc /usr/local/lib/pkgconfig/
# mkdir /usr/local/lib/pkgconfig; cp libcineformsdk.pc /usr/local/lib/pkgconfig/
)}

$1

0 comments on commit c173178

Please sign in to comment.