Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
digiKam
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Peter Becker
digiKam
Commits
b675badc
Commit
b675badc
authored
May 16, 2020
by
Gilles Caulier
🗼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Try to fix Daily MacOS CI build from Jenkins Binary Factory
parent
fb5828a8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
34 additions
and
7 deletions
+34
-7
core/cmake/modules/FindQtAV.cmake
core/cmake/modules/FindQtAV.cmake
+34
-7
No files found.
core/cmake/modules/FindQtAV.cmake
View file @
b675badc
...
...
@@ -10,7 +10,7 @@
# QTAV_PATCH_VERSION - The patch value of QtAV version ID defined in QtAV/version.h as "0".
# QTAV_VERSION_STRING - Version string e.g. "1.12.0"
#
# Copyright (c) 2016-2020 by Gilles Caulier
,
<caulier dot gilles at gmail dot com>
# Copyright (c) 2016-2020 by Gilles Caulier <caulier dot gilles at gmail dot com>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
...
...
@@ -24,6 +24,7 @@ find_package(Qt5
Message
(
STATUS
"QtAV search path:
${
_qt5_install_prefix
}
"
)
if
(
NOT APPLE
)
find_path
(
QTAV_CORE_INCLUDE_DIR
NAMES QtAV.h
HINTS
${
Qt5Core_INCLUDE_DIRS
}
...
...
@@ -82,11 +83,15 @@ else()
)
if
(
QTAV_CORE_INCLUDE_DIR AND QTAV_WIDGETS_INCLUDE_DIR
)
set
(
QTAV_INCLUDE_DIRS
"
${
QTAV_CORE_INCLUDE_DIR
}
;
${
QTAV_WIDGETS_INCLUDE_DIR
}
"
)
set
(
QTAV_LIBRARIES
"
${
_qt5_install_prefix
}
/../QtAV.framework/QtAV;
${
_qt5_install_prefix
}
/../QtAVWidgets.framework/QtAVWidgets"
)
else
()
set
(
QTAV_INCLUDE_DIRS
"
${
_qt5_install_prefix
}
/../../include/QtAV;
${
_qt5_install_prefix
}
/../../include/QtAVWidgets"
)
set
(
QTAV_LIBRARIES
"
${
_qt5_install_prefix
}
/../QtAV.framework/QtAV;
${
_qt5_install_prefix
}
/../QtAVWidgets.framework/QtAVWidgets"
)
endif
()
endif
()
...
...
@@ -97,25 +102,47 @@ find_package_handle_standard_args(QtAV REQUIRED_VARS QTAV_LIBRARIES QTAV_INCLUDE
if
(
QtAV_FOUND
)
if
(
NOT APPLE
)
if
(
EXISTS
${
QTAV_CORE_INCLUDE_DIR
}
/version.h
)
Message
(
STATUS
"Found QtAV version header:
${
QTAV_CORE_INCLUDE_DIR
}
/version.h"
)
file
(
READ
${
QTAV_CORE_INCLUDE_DIR
}
/version.h QTAV_VERSION_CONTENT
)
set
(
QtAV_VERSION_FOUND TRUE
)
endif
()
else
()
if
(
EXISTS
${
QTAV_CORE_INCLUDE_DIR
}
/QtAV/version.h
)
Message
(
STATUS
"Found QtAV version header:
${
QTAV_CORE_INCLUDE_DIR
}
/QtAV/version.h"
)
file
(
READ
${
QTAV_CORE_INCLUDE_DIR
}
/QtAV/version.h QTAV_VERSION_CONTENT
)
set
(
QtAV_VERSION_FOUND TRUE
)
else
()
if
(
EXISTS
${
QTAV_CORE_INCLUDE_DIR
}
/version.h
)
Message
(
STATUS
"Found QtAV version header:
${
QTAV_CORE_INCLUDE_DIR
}
/version.h"
)
file
(
READ
${
QTAV_CORE_INCLUDE_DIR
}
/version.h QTAV_VERSION_CONTENT
)
set
(
QtAV_VERSION_FOUND TRUE
)
endif
()
endif
()
endif
()
string
(
REGEX MATCH
"#define QTAV_MAJOR ([0-9]+)"
QTAV_MAJOR_MATCH
${
QTAV_VERSION_CONTENT
}
)
string
(
REPLACE
"#define QTAV_MAJOR "
""
QTAV_MAJOR_VERSION
${
QTAV_MAJOR_MATCH
}
)
string
(
REGEX MATCH
"#define QTAV_MINOR ([0-9]+)"
QTAV_MINOR_MATCH
${
QTAV_VERSION_CONTENT
}
)
string
(
REPLACE
"#define QTAV_MINOR "
""
QTAV_MINOR_VERSION
${
QTAV_MINOR_MATCH
}
)
string
(
REGEX MATCH
"#define QTAV_PATCH ([0-9]+)"
QTAV_PATCH_MATCH
${
QTAV_VERSION_CONTENT
}
)
string
(
REPLACE
"#define QTAV_PATCH "
""
QTAV_PATCH_VERSION
${
QTAV_PATCH_MATCH
}
)
if
(
QtAV_VERSION_FOUND
)
string
(
REGEX MATCH
"#define QTAV_MAJOR ([0-9]+)"
QTAV_MAJOR_MATCH
${
QTAV_VERSION_CONTENT
}
)
string
(
REPLACE
"#define QTAV_MAJOR "
""
QTAV_MAJOR_VERSION
${
QTAV_MAJOR_MATCH
}
)
string
(
REGEX MATCH
"#define QTAV_MINOR ([0-9]+)"
QTAV_MINOR_MATCH
${
QTAV_VERSION_CONTENT
}
)
string
(
REPLACE
"#define QTAV_MINOR "
""
QTAV_MINOR_VERSION
${
QTAV_MINOR_MATCH
}
)
string
(
REGEX MATCH
"#define QTAV_PATCH ([0-9]+)"
QTAV_PATCH_MATCH
${
QTAV_VERSION_CONTENT
}
)
string
(
REPLACE
"#define QTAV_PATCH "
""
QTAV_PATCH_VERSION
${
QTAV_PATCH_MATCH
}
)
endif
()
if
(
NOT QTAV_MAJOR_VERSION STREQUAL
""
AND
NOT QTAV_MINOR_VERSION STREQUAL
""
AND
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment