Skip to content

Commit cf9fbf4

Browse files
committed
Properly install DLL on Win32
Adding a RUNTIME DESTINATION to the install for the library target will install the DLL on Windows systems, so it no longer has to be manually copied in the `.gitlab-ci.yml` script
1 parent 1e00618 commit cf9fbf4

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

.gitlab-ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ windows-builder-x64:
7878
- cmake -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR\build\install-x64" -G "MinGW Makefiles" -D"CMAKE_BUILD_TYPE:STRING=Release" ../
7979
- mingw32-make install
8080
- Move-Item -Force -path "install-x64\lib\python3.6\site-packages\*openshot*" -destination "install-x64\python\"
81-
- cp src\libopenshot.dll install-x64\lib
8281
- New-Item -path "install-x64/share/" -Name "$CI_PROJECT_NAME" -Value "CI_PROJECT_NAME:$CI_PROJECT_NAME`nCI_COMMIT_REF_NAME:$CI_COMMIT_REF_NAME`nCI_COMMIT_SHA:$CI_COMMIT_SHA`nCI_JOB_ID:$CI_JOB_ID" -ItemType file -force
8382
- $PREV_GIT_LABEL=(git describe --tags --abbrev=0)
8483
- git log "$PREV_GIT_LABEL..HEAD" --oneline --pretty=format:"%C(auto,yellow)%h%C(auto,magenta)% %C(auto,blue)%>(12,trunc)%ad %C(auto,green)%<(25,trunc)%aN%C(auto,reset)%s%C(auto,red)% gD% D" --date=short > "install-x64/share/$CI_PROJECT_NAME.log"
@@ -109,7 +108,6 @@ windows-builder-x86:
109108
- cmake -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR\build\install-x86" -G "MinGW Makefiles" -D"CMAKE_BUILD_TYPE:STRING=Release" -D"CMAKE_CXX_FLAGS=-m32" -D"CMAKE_EXE_LINKER_FLAGS=-Wl,--large-address-aware" -D"CMAKE_C_FLAGS=-m32" ../
110109
- mingw32-make install
111110
- Move-Item -Force -path "install-x86\lib\python3.6\site-packages\*openshot*" -destination "install-x86\python\"
112-
- cp src\libopenshot.dll install-x86\lib
113111
- New-Item -path "install-x86/share/" -Name "$CI_PROJECT_NAME" -Value "CI_PROJECT_NAME:$CI_PROJECT_NAME`nCI_COMMIT_REF_NAME:$CI_COMMIT_REF_NAME`nCI_COMMIT_SHA:$CI_COMMIT_SHA`nCI_JOB_ID:$CI_JOB_ID" -ItemType file -force
114112
- $PREV_GIT_LABEL=(git describe --tags --abbrev=0)
115113
- git log "$PREV_GIT_LABEL..HEAD" --oneline --pretty=format:"%C(auto,yellow)%h%C(auto,magenta)% %C(auto,blue)%>(12,trunc)%ad %C(auto,green)%<(25,trunc)%aN%C(auto,reset)%s%C(auto,red)% gD% D" --date=short > "install-x86/share/$CI_PROJECT_NAME.log"

src/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,7 @@ set(LIB_INSTALL_DIR lib${LIB_SUFFIX}) # determine correct lib folder
400400
INSTALL( TARGETS openshot
401401
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
402402
LIBRARY DESTINATION ${LIB_INSTALL_DIR}
403+
RUNTIME DESTINATION ${LIB_INSTALL_DIR}
403404
COMPONENT library )
404405

405406
INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include/

0 commit comments

Comments
 (0)