Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
J
jami-daemon
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
129
Issues
129
List
Boards
Labels
Service Desk
Milestones
Iterations
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
savoirfairelinux
jami-daemon
Commits
e7d178c9
Commit
e7d178c9
authored
Nov 28, 2019
by
Adrien Béraud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: update yaml-cpp
Change-Id: Ib7700f2ad5988279e657cf9c6688afc54e31ad31
parent
3babe447
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
20 deletions
+8
-20
contrib/src/yaml-cpp/SHA512SUMS
contrib/src/yaml-cpp/SHA512SUMS
+1
-1
contrib/src/yaml-cpp/cmake.patch
contrib/src/yaml-cpp/cmake.patch
+0
-13
contrib/src/yaml-cpp/rules.mak
contrib/src/yaml-cpp/rules.mak
+7
-6
No files found.
contrib/src/yaml-cpp/SHA512SUMS
View file @
e7d178c9
6
3f70fdc4cb23c90a9c671dadc57093250c351828b7f9ad70a1c8389ea5aefc6bcf30b186a62f3319ae011d0a0a091abced130e6754a244418d52c3e74b0e2c1 yaml-cpp-24fa1b33805c9a91df0f32c46c28e314dd7ad96f
.tar.gz
6
8b9ce987cabc1dec79382f922de20cc2c222cb9c090ecb93dc686b048da5c917facf4fce6d8f72feea44b61e5a6770ed3b0c199c4cd4e6bde5b6245c09f8e49 yaml-cpp-yaml-cpp-0.6.3
.tar.gz
\ No newline at end of file
contrib/src/yaml-cpp/cmake.patch
deleted
100644 → 0
View file @
3babe447
--- yaml-cpp/CMakeLists.txt.orig 2014-09-05 18:09:22.644410515 -0400
+++ yaml-cpp/CMakeLists.txt 2014-09-05 18:12:20.372407142 -0400
@@ -269,10 +269,10 @@
FILES_MATCHING PATTERN "*.h"
)
-if(UNIX)
+if(UNIX OR MINGW)
set(PC_FILE ${CMAKE_BINARY_DIR}/yaml-cpp.pc)
configure_file("yaml-cpp.pc.cmake" ${PC_FILE} @ONLY)
- install(FILES ${PC_FILE} DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+ install(FILES ${PC_FILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
endif()
contrib/src/yaml-cpp/rules.mak
View file @
e7d178c9
# YAML
YAML_CPP_VERSION
:=
24fa1b33805c9a91df0f32c46c28e314dd7ad96f
YAML_CPP_VERSION
:=
yaml-cpp-0.6.3
YAML_CPP_URL
:=
https://github.com/jbeder/yaml-cpp/archive/
$(YAML_CPP_VERSION)
.tar.gz
PKGS
+=
yaml-cpp
...
...
@@ -8,10 +8,12 @@ ifeq ($(call need_pkg,'yaml-cpp >= 0.5.3'),)
PKGS_FOUND
+=
yaml-cpp
endif
YAML_CPP_CMAKECONF
:=
-DBUILD_STATIC
:BOOL
=
ON
\
-DBUILD_SHARED
:BOOL
=
OFF
\
-DYAML_CPP_BUILD_TOOLS
:BOOL
=
OFF
\
-DBUILD_SHARED_LIBS
:BOOL
=
OFF
YAML_CPP_CMAKECONF
:=
-DBUILD_STATIC
=
ON
\
-DBUILD_SHARED
=
OFF
\
-DYAML_CPP_BUILD_TOOLS
=
OFF
\
-DYAML_CPP_BUILD_TESTS
=
OFF
\
-DYAML_CPP_BUILD_CONTRIB
=
OFF
\
-DBUILD_SHARED_LIBS
=
OFF
$(TARBALLS)/yaml-cpp-$(YAML_CPP_VERSION).tar.gz
:
$(
call
download,
$(YAML_CPP_URL)
)
...
...
@@ -20,7 +22,6 @@ $(TARBALLS)/yaml-cpp-$(YAML_CPP_VERSION).tar.gz:
yaml-cpp
:
yaml-cpp-$(YAML_CPP_VERSION).tar.gz .sum-yaml-cpp
$(UNPACK)
$(APPLY)
$(SRC)
/yaml-cpp/cmake.patch
$(MOVE)
.yaml-cpp
:
yaml-cpp toolchain.cmake
...
...
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