Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade yaml-cpp to 0.8.0 #705

Merged
merged 3 commits into from
Sep 4, 2023
Merged

Upgrade yaml-cpp to 0.8.0 #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5baaad
fix: fix cmake conflict in yaml-cpp 0.8.0
Bambooin Sep 4, 2023
1d29b89
chore: upgrade yaml-cpp to 0.8.0
Bambooin Sep 4, 2023
210f508
fix yaml-cpp 0.8.0 build
eagleoflqj Sep 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@ find_package(YamlCpp REQUIRED)
if(YamlCpp_FOUND)
include_directories(${YamlCpp_INCLUDE_PATH})
endif()
if(YamlCpp_STATIC)
add_definitions(-DYAML_CPP_STATIC_DEFINE)
endif()

find_package(LevelDb REQUIRED)
if(LevelDb_FOUND)
Expand Down Expand Up @@ -179,12 +182,12 @@ if(NOT DEFINED BIN_INSTALL_DIR)
endif()
# }

# uninstall target
# remove target
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
IMMEDIATE @ONLY)
add_custom_target(uninstall
add_custom_target(remove
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)

if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|DragonFly|GNU" OR MINGW)
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ install-debug:
cmake --build $(build) --target install

uninstall:
cmake --build $(build) --target uninstall
cmake --build $(build) --target remove

uninstall-debug:
cmake --build $(build) --target uninstall
cmake --build $(build) --target remove

test: release
(cd $(build)/test; ./rime_test)
Expand Down
2 changes: 1 addition & 1 deletion deps/yaml-cpp
Open in desktop
Submodule yaml-cpp updated 342 files