Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
S
stitchEm
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Franco (nextime) Lanza
stitchEm
Commits
36e59555
Commit
36e59555
authored
May 11, 2019
by
Wieland Morgenstern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use conan.cmake, install libpng through conan
parent
94e22b0d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
1 deletion
+18
-1
CMakeLists.txt
CMakeLists.txt
+13
-0
external_deps.cmake
cmake/external_deps.cmake
+5
-1
No files found.
CMakeLists.txt
View file @
36e59555
...
...
@@ -110,6 +110,19 @@ if(WIN32)
set
(
WINDOWS True
)
set
(
PLATFORM_SHORTHAND win
)
message
(
STATUS
"System: WINDOWS"
)
if
(
WIN_CHOCO
)
if
(
NOT EXISTS
"
${
CMAKE_BINARY_DIR
}
/conan.cmake"
)
message
(
STATUS
"Downloading conan.cmake from https://github.com/conan-io/cmake-conan"
)
file
(
DOWNLOAD
"https://github.com/conan-io/cmake-conan/raw/v0.14/conan.cmake"
"
${
CMAKE_BINARY_DIR
}
/conan.cmake"
)
conan_add_remote
(
NAME bincrafters URL https://api.bintray.com/conan/bincrafters/public-conan
)
conan_cmake_run
(
REQUIRES libpng/1.6.37@bincrafters/stable
)
endif
()
endif
()
endif
(
WIN32
)
# ----------------------------------------------------------------------------
...
...
cmake/external_deps.cmake
View file @
36e59555
...
...
@@ -6,6 +6,10 @@ elseif(LINUX)
elseif
(
ANDROID
)
find_library
(
PNG_LIBRARY png PATHS
${
CMAKE_EXTERNAL_LIB
}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
)
elseif
(
WINDOWS
)
find_debug_and_optimized_library
(
PNG_LIBRARY
"libpng/debug"
"libpng"
"libpng/release"
"libpng"
)
if
(
WIN_CHOCO
)
set
(
PNG_LIBRARY CONAN_PKG::libpng
)
else
()
find_debug_and_optimized_library
(
PNG_LIBRARY
"libpng/debug"
"libpng"
"libpng/release"
"libpng"
)
endif
()
endif
()
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