Skip to content

Commit 926ddab

Browse files
ferdnycferdnyc
authored
Merge branch 'develop' into rename-rshift
2 parents 7415ad9 + 101f25a commit 926ddab

22 files changed

+281
-197
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ build/*
77
.project
88
.cproject
99
/.metadata/
10+
*~

‎.gitlab-ci.yml‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ linux-builder:
2020
- cmake -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR/build/install-x64" -D"CMAKE_BUILD_TYPE:STRING=Release" ../
2121
- make
2222
- make install
23-
- mv /usr/local/lib/python3.4/dist-packages/*openshot* install-x64/python
23+
- mv install-x64/lib/python3.4/site-packages/*openshot* install-x64/python
2424
- echo -e "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" > "install-x64/share/$CI_PROJECT_NAME"
2525
- git log $(git describe --tags --abbrev=0)..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"
2626
when: always
@@ -47,7 +47,7 @@ mac-builder:
4747
- cmake -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR/build/install-x64" -DCMAKE_CXX_COMPILER=/usr/local/opt/gcc48/bin/g++-4.8 -DCMAKE_C_COMPILER=/usr/local/opt/gcc48/bin/gcc-4.8 -DCMAKE_PREFIX_PATH=/usr/local/qt5/5.5/clang_64 -DPYTHON_INCLUDE_DIR=/Library/Frameworks/Python.framework/Versions/3.6/include/python3.6m -DPYTHON_LIBRARY=/Library/Frameworks/Python.framework/Versions/3.6/lib/libpython3.6.dylib -DPython_FRAMEWORKS=/Library/Frameworks/Python.framework/ -D"CMAKE_BUILD_TYPE:STRING=Debug" -D"CMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk" -D"CMAKE_OSX_DEPLOYMENT_TARGET=10.9" -D"CMAKE_INSTALL_RPATH_USE_LINK_PATH=1" -D"ENABLE_RUBY=0" ../
4848
- make
4949
- make install
50-
- mv /Library/Frameworks/Python.framework/Versions/3.6/lib/python3.6/site-packages/*openshot* install-x64/python
50+
- mv install-x64/lib/python3.6/site-packages/*openshot* install-x64/python
5151
- echo -e "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" > "install-x64/share/$CI_PROJECT_NAME"
5252
- git log $(git describe --tags --abbrev=0)..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"
5353
when: always
@@ -56,61 +56,61 @@ mac-builder:
5656
tags:
5757
- mac
5858

59-
windows-builder-x86:
59+
windows-builder-x64:
6060
stage: build-libopenshot
6161
artifacts:
6262
expire_in: 6 months
6363
paths:
64-
- build\install-x86\*
64+
- build\install-x64\*
6565
script:
66-
- try { Invoke-WebRequest -Uri "http://gitlab.openshot.org/OpenShot/libopenshot-audio/-/jobs/artifacts/$CI_COMMIT_REF_NAME/download?job=windows-builder-x86" -Headers @{"PRIVATE-TOKEN"="$ACCESS_TOKEN"} -OutFile "artifacts.zip" } catch { $_.Exception.Response.StatusCode.Value__ }
67-
- if (-not (Test-Path "artifacts.zip")) { Invoke-WebRequest -Uri "http://gitlab.openshot.org/OpenShot/libopenshot-audio/-/jobs/artifacts/develop/download?job=windows-builder-x86" -Headers @{"PRIVATE-TOKEN"="$ACCESS_TOKEN"} -OutFile "artifacts.zip" }
66+
- try { Invoke-WebRequest -Uri "http://gitlab.openshot.org/OpenShot/libopenshot-audio/-/jobs/artifacts/$CI_COMMIT_REF_NAME/download?job=windows-builder-x64" -Headers @{"PRIVATE-TOKEN"="$ACCESS_TOKEN"} -OutFile "artifacts.zip" } catch { $_.Exception.Response.StatusCode.Value__ }
67+
- if (-not (Test-Path "artifacts.zip")) { Invoke-WebRequest -Uri "http://gitlab.openshot.org/OpenShot/libopenshot-audio/-/jobs/artifacts/develop/download?job=windows-builder-x64" -Headers @{"PRIVATE-TOKEN"="$ACCESS_TOKEN"} -OutFile "artifacts.zip" }
6868
- Expand-Archive -Path artifacts.zip -DestinationPath .
69-
- $env:LIBOPENSHOT_AUDIO_DIR = "$CI_PROJECT_DIR\build\install-x86"
70-
- $env:UNITTEST_DIR = "C:\msys32\usr"
71-
- $env:RESVGDIR = "C:\msys32\usr\local"
72-
- $env:ZMQDIR = "C:\msys32\usr"
73-
- $env:Path = "C:\msys32\mingw32\bin;C:\msys32\mingw32\lib;C:\msys32\usr\lib\cmake\UnitTest++;C:\msys32\home\jonathan\depot_tools;C:\msys32\usr;C:\msys32\usr\lib;" + $env:Path;
69+
- $env:LIBOPENSHOT_AUDIO_DIR = "$CI_PROJECT_DIR\build\install-x64"
70+
- $env:UNITTEST_DIR = "C:\msys64\usr"
71+
- $env:ZMQDIR = "C:\msys64\usr"
72+
- $env:Path = "C:\msys64\mingw64\bin;C:\msys64\mingw64\lib;C:\msys64\usr\lib\cmake\UnitTest++;C:\msys64\home\jonathan\depot_tools;C:\msys64\usr;C:\msys64\usr\lib;" + $env:Path;
7473
- New-Item -ItemType Directory -Force -Path build
75-
- New-Item -ItemType Directory -Force -Path build\install-x86\python
74+
- New-Item -ItemType Directory -Force -Path build\install-x64\python
7675
- cd build
77-
- 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" ../
76+
- cmake -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR\build\install-x64" -G "MinGW Makefiles" -D"CMAKE_BUILD_TYPE:STRING=Release" ../
7877
- mingw32-make install
79-
- Move-Item -Force -path "C:\msys32\mingw32\lib\python3.6\site-packages\*openshot*" -destination "install-x86\python\"
80-
- cp src\libopenshot.dll install-x86\lib
81-
- 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
78+
- Move-Item -Force -path "install-x64\lib\python3.6\site-packages\*openshot*" -destination "install-x64\python\"
79+
- cp src\libopenshot.dll install-x64\lib
80+
- 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
8281
- $PREV_GIT_LABEL=(git describe --tags --abbrev=0)
83-
- 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"
82+
- 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"
8483
when: always
8584
except:
8685
- tags
8786
tags:
8887
- windows
8988

90-
windows-builder-x64:
89+
windows-builder-x86:
9190
stage: build-libopenshot
9291
artifacts:
9392
expire_in: 6 months
9493
paths:
95-
- build\install-x64\*
94+
- build\install-x86\*
9695
script:
97-
- try { Invoke-WebRequest -Uri "http://gitlab.openshot.org/OpenShot/libopenshot-audio/-/jobs/artifacts/$CI_COMMIT_REF_NAME/download?job=windows-builder-x64" -Headers @{"PRIVATE-TOKEN"="$ACCESS_TOKEN"} -OutFile "artifacts.zip" } catch { $_.Exception.Response.StatusCode.Value__ }
98-
- if (-not (Test-Path "artifacts.zip")) { Invoke-WebRequest -Uri "http://gitlab.openshot.org/OpenShot/libopenshot-audio/-/jobs/artifacts/develop/download?job=windows-builder-x64" -Headers @{"PRIVATE-TOKEN"="$ACCESS_TOKEN"} -OutFile "artifacts.zip" }
96+
- try { Invoke-WebRequest -Uri "http://gitlab.openshot.org/OpenShot/libopenshot-audio/-/jobs/artifacts/$CI_COMMIT_REF_NAME/download?job=windows-builder-x86" -Headers @{"PRIVATE-TOKEN"="$ACCESS_TOKEN"} -OutFile "artifacts.zip" } catch { $_.Exception.Response.StatusCode.Value__ }
97+
- if (-not (Test-Path "artifacts.zip")) { Invoke-WebRequest -Uri "http://gitlab.openshot.org/OpenShot/libopenshot-audio/-/jobs/artifacts/develop/download?job=windows-builder-x86" -Headers @{"PRIVATE-TOKEN"="$ACCESS_TOKEN"} -OutFile "artifacts.zip" }
9998
- Expand-Archive -Path artifacts.zip -DestinationPath .
100-
- $env:LIBOPENSHOT_AUDIO_DIR = "$CI_PROJECT_DIR\build\install-x64"
101-
- $env:UNITTEST_DIR = "C:\msys64\usr"
102-
- $env:ZMQDIR = "C:\msys64\usr"
103-
- $env:Path = "C:\msys64\mingw64\bin;C:\msys64\mingw64\lib;C:\msys64\usr\lib\cmake\UnitTest++;C:\msys64\home\jonathan\depot_tools;C:\msys64\usr;C:\msys64\usr\lib;" + $env:Path;
99+
- $env:LIBOPENSHOT_AUDIO_DIR = "$CI_PROJECT_DIR\build\install-x86"
100+
- $env:UNITTEST_DIR = "C:\msys32\usr"
101+
- $env:RESVGDIR = "C:\msys32\usr\local"
102+
- $env:ZMQDIR = "C:\msys32\usr"
103+
- $env:Path = "C:\msys32\mingw32\bin;C:\msys32\mingw32\lib;C:\msys32\usr\lib\cmake\UnitTest++;C:\msys32\home\jonathan\depot_tools;C:\msys32\usr;C:\msys32\usr\lib;" + $env:Path;
104104
- New-Item -ItemType Directory -Force -Path build
105-
- New-Item -ItemType Directory -Force -Path build\install-x64\python
105+
- New-Item -ItemType Directory -Force -Path build\install-x86\python
106106
- cd build
107-
- cmake -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR\build\install-x64" -G "MinGW Makefiles" -D"CMAKE_BUILD_TYPE:STRING=Release" ../
107+
- 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" ../
108108
- mingw32-make install
109-
- Move-Item -Force -path "C:\msys64\mingw64\lib\python3.6\site-packages\*openshot*" -destination "install-x64\python\"
110-
- cp src\libopenshot.dll install-x64\lib
111-
- 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
109+
- Move-Item -Force -path "install-x86\lib\python3.6\site-packages\*openshot*" -destination "install-x86\python\"
110+
- cp src\libopenshot.dll install-x86\lib
111+
- 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
112112
- $PREV_GIT_LABEL=(git describe --tags --abbrev=0)
113-
- 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"
113+
- 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"
114114
when: always
115115
except:
116116
- tags

‎.travis.yml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
1-
dist: trusty
1+
dist: xenial
2+
sudo: required
23

34
matrix:
45
include:
56
- language: cpp
67
name: "FFmpeg 2"
78
before_script:
89
- sudo add-apt-repository ppa:openshot.developers/libopenshot-daily -y
9-
- sudo add-apt-repository ppa:beineri/opt-qt58-trusty -y
10+
- sudo add-apt-repository ppa:beineri/opt-qt-5.10.0-xenial -y
1011
- sudo apt-get update -qq
1112
- sudo apt-get install gcc-4.8 cmake libavcodec-dev libavformat-dev libswscale-dev libavresample-dev libavutil-dev libopenshot-audio-dev libopenshot-dev libfdk-aac-dev libfdk-aac-dev libjsoncpp-dev libmagick++-dev libopenshot-audio-dev libunittest++-dev libzmq3-dev pkg-config python3-dev qtbase5-dev qtmultimedia5-dev swig -y
1213
- sudo apt autoremove -y
1314
script:
1415
- mkdir -p build; cd build;
1516
- cmake -D"CMAKE_BUILD_TYPE:STRING=Debug" ../
1617
- make VERBOSE=1
17-
- make test
18+
- make os_test
1819

1920
- language: cpp
2021
name: "FFmpeg 3"
2122
before_script:
2223
- sudo add-apt-repository ppa:openshot.developers/libopenshot-daily -y
23-
- sudo add-apt-repository ppa:beineri/opt-qt58-trusty -y
24+
- sudo add-apt-repository ppa:beineri/opt-qt-5.10.0-xenial -y
2425
- sudo add-apt-repository ppa:jonathonf/ffmpeg-3 -y
2526
- sudo apt-get update -qq
2627
- sudo apt-get install gcc-4.8 cmake libavcodec-dev libavformat-dev libswscale-dev libavresample-dev libavutil-dev libopenshot-audio-dev libopenshot-dev libfdk-aac-dev libfdk-aac-dev libjsoncpp-dev libmagick++-dev libopenshot-audio-dev libunittest++-dev libzmq3-dev pkg-config python3-dev qtbase5-dev qtmultimedia5-dev swig -y
@@ -29,13 +30,13 @@ matrix:
2930
- mkdir -p build; cd build;
3031
- cmake -D"CMAKE_BUILD_TYPE:STRING=Debug" ../
3132
- make VERBOSE=1
32-
- make test
33+
- make os_test
3334

3435
- language: cpp
3536
name: "FFmpeg 4"
3637
before_script:
3738
- sudo add-apt-repository ppa:openshot.developers/libopenshot-daily -y
38-
- sudo add-apt-repository ppa:beineri/opt-qt58-trusty -y
39+
- sudo add-apt-repository ppa:beineri/opt-qt-5.10.0-xenial -y
3940
- sudo add-apt-repository ppa:jonathonf/ffmpeg -y
4041
- sudo add-apt-repository ppa:jonathonf/ffmpeg-4 -y
4142
- sudo add-apt-repository ppa:jonathonf/backports -y
@@ -46,4 +47,4 @@ matrix:
4647
- mkdir -p build; cd build;
4748
- cmake -D"CMAKE_BUILD_TYPE:STRING=Debug" ../
4849
- make VERBOSE=1
49-
- make test
50+
- make os_test

‎CMakeLists.txt‎

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
#
55
# @section LICENSE
66
#
7-
# Copyright (c) 2008-2014 OpenShot Studios, LLC
7+
# Copyright (c) 2008-2019 OpenShot Studios, LLC
88
# <http://www.openshotstudios.com/>. This file is part of
9-
# OpenShot Library (libopenshot), an open-source project dedicated to
10-
# delivering high quality video editing and animation solutions to the
9+
# OpenShot Library (libopenshot), an open-source project dedicated to
10+
# delivering high quality video editing and animation solutions to the
1111
# world. For more information visit <http://www.openshot.org/>.
1212
#
1313
# OpenShot Library (libopenshot) is free software: you can redistribute it
@@ -24,24 +24,29 @@
2424
# along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
2525
################################################################################
2626

27-
cmake_minimum_required(VERSION 2.8.11)
27+
cmake_minimum_required(VERSION 3.1...3.14 FATAL_ERROR)
2828

29-
MESSAGE("--------------------------------------------------------------")
30-
MESSAGE("Welcome to the OpenShot Build System! CMake will now check for all required build")
31-
MESSAGE("dependencies and notify you of any missing files or other issues. If you have any")
32-
MESSAGE("questions or issues, please visit <http://www.openshot.org/>.")
29+
message("\
30+
-----------------------------------------------------------------
31+
Welcome to the OpenShot Build System!
32+
33+
CMake will now check libopenshot's build dependencies and inform
34+
you of any missing files or other issues.
35+
36+
For more information, please visit <http://www.openshot.org/>.
37+
-----------------------------------------------------------------")
3338

3439
################ ADD CMAKE MODULES ##################
3540
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules")
3641

3742
################ GET VERSION INFORMATION FROM VERSION.H ##################
38-
MESSAGE("--------------------------------------------------------------")
39-
MESSAGE("Determining Version Number (from Version.h file)")
43+
message(STATUS "Determining Version Number (from Version.h file)")
4044

4145
#### Get the lines related to libopenshot version from the Version.h header
42-
file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/include/Version.h OPENSHOT_VERSION_LINES
43-
REGEX "#define[ ]+OPENSHOT_VERSION_.*[0-9]+;.*")
44-
46+
file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/include/Version.h
47+
OPENSHOT_VERSION_LINES
48+
REGEX "#define[ ]+OPENSHOT_VERSION_.*[0-9]+;.*")
49+
4550
#### Set each line into it's own variable
4651
list (GET OPENSHOT_VERSION_LINES 0 LINE_MAJOR)
4752
list (GET OPENSHOT_VERSION_LINES 1 LINE_MINOR)
@@ -53,22 +58,27 @@ STRING(REGEX REPLACE "#define[ ]+OPENSHOT_VERSION_MAJOR[ ]+([0-9]+);(.*)" "\\1"
5358
STRING(REGEX REPLACE "#define[ ]+OPENSHOT_VERSION_MINOR[ ]+([0-9]+);(.*)" "\\1" MINOR_VERSION "${LINE_MINOR}")
5459
STRING(REGEX REPLACE "#define[ ]+OPENSHOT_VERSION_BUILD[ ]+([0-9]+);(.*)" "\\1" BUILD_VERSION "${LINE_BUILD}")
5560
STRING(REGEX REPLACE "#define[ ]+OPENSHOT_VERSION_SO[ ]+([0-9]+);(.*)" "\\1" SO_VERSION "${LINE_SO}")
56-
set(PROJECT_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${BUILD_VERSION}")
5761

58-
MESSAGE("--> MAJOR Version: ${MAJOR_VERSION}")
59-
MESSAGE("--> MINOR Version: ${MINOR_VERSION}")
60-
MESSAGE("--> BUILD Version: ${BUILD_VERSION}")
61-
MESSAGE("--> SO/API/ABI Version: ${SO_VERSION}")
62-
MESSAGE("--> VERSION: ${PROJECT_VERSION}")
63-
MESSAGE("")
62+
message(STATUS "MAJOR Version: ${MAJOR_VERSION}")
63+
message(STATUS "MINOR Version: ${MINOR_VERSION}")
64+
message(STATUS "BUILD Version: ${BUILD_VERSION}")
65+
message(STATUS "SO/API/ABI Version: ${SO_VERSION}")
66+
message(STATUS "Determining Version Number - done")
6467

6568
################### SETUP PROJECT ###################
66-
PROJECT(openshot)
67-
MESSAGE("--------------------------------------------------------------")
68-
MESSAGE("Generating build files for ${PROJECT_NAME} (${PROJECT_VERSION})")
69+
PROJECT(libopenshot LANGUAGES C CXX
70+
VERSION ${MAJOR_VERSION}.${MINOR_VERSION}.${BUILD_VERSION})
71+
72+
message("
73+
Generating build files for OpenShot
74+
Building ${PROJECT_NAME} (version ${PROJECT_VERSION})
75+
SO/API/ABI Version: ${SO_VERSION}
76+
")
6977

7078
#### Enable C++11 (for std::shared_ptr support)
71-
set(CMAKE_CXX_FLAGS "-std=c++11")
79+
set(CMAKE_CXX_STANDARD 11)
80+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
81+
set(CMAKE_CXX_EXTENSIONS OFF)
7282

7383
IF (WIN32)
7484
SET_PROPERTY(GLOBAL PROPERTY WIN32 "WIN32")

‎cmake/Modules/FindOpenShotAudio.cmake‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,12 @@
77

88
message("$ENV{LIBOPENSHOT_AUDIO_DIR}")
99

10-
# Find the base directory of juce includes
11-
find_path(LIBOPENSHOT_AUDIO_BASE_DIR JuceHeader.h
10+
# Find the libopenshot-audio header files
11+
find_path(LIBOPENSHOT_AUDIO_INCLUDE_DIR JuceHeader.h
1212
PATHS $ENV{LIBOPENSHOT_AUDIO_DIR}/include/libopenshot-audio/
1313
/usr/include/libopenshot-audio/
1414
/usr/local/include/libopenshot-audio/ )
1515

16-
# Get a list of all header file paths
17-
FILE(GLOB_RECURSE JUCE_HEADER_FILES
18-
${LIBOPENSHOT_AUDIO_BASE_DIR}/*.h
19-
)
20-
21-
# Loop through each header file
22-
FOREACH(HEADER_PATH ${JUCE_HEADER_FILES})
23-
# Get the directory of each header file
24-
get_filename_component(HEADER_DIRECTORY ${HEADER_PATH}
25-
PATH
26-
)
27-
28-
# Append each directory into the HEADER_DIRECTORIES list
29-
LIST(APPEND HEADER_DIRECTORIES ${HEADER_DIRECTORY})
30-
ENDFOREACH(HEADER_PATH)
31-
32-
# Remove duplicates from the header directories list
33-
LIST(REMOVE_DUPLICATES HEADER_DIRECTORIES)
34-
3516
# Find the libopenshot-audio.so (check env var first)
3617
find_library(LIBOPENSHOT_AUDIO_LIBRARY
3718
NAMES libopenshot-audio openshot-audio
@@ -48,9 +29,7 @@ find_library(LIBOPENSHOT_AUDIO_LIBRARY
4829
set(LIBOPENSHOT_AUDIO_LIBRARIES ${LIBOPENSHOT_AUDIO_LIBRARY})
4930
set(LIBOPENSHOT_AUDIO_LIBRARY ${LIBOPENSHOT_AUDIO_LIBRARIES})
5031

51-
# Seems to work fine with just the base dir (rather than all the actual include folders)
52-
set(LIBOPENSHOT_AUDIO_INCLUDE_DIR ${LIBOPENSHOT_AUDIO_BASE_DIR} )
53-
set(LIBOPENSHOT_AUDIO_INCLUDE_DIRS ${LIBOPENSHOT_AUDIO_BASE_DIR} )
32+
set(LIBOPENSHOT_AUDIO_INCLUDE_DIRS ${LIBOPENSHOT_AUDIO_INCLUDE_DIR} )
5433

5534
include(FindPackageHandleStandardArgs)
5635
# handle the QUIETLY and REQUIRED arguments and set LIBOPENSHOT_AUDIO_FOUND to TRUE

0 commit comments

Comments
 (0)