Skip to content

Commit 94308c3

Browse files
try to restructure CMakeLists
1 parent 7c059db commit 94308c3

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

cmake/YamlCpp.cmake

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ if (yaml-cpp_BUNDLED)
22
message("-- Building bundled yaml-cpp package...")
33
include(FetchContent)
44

5-
set(YAML_CPP_BUILD_TESTS OFF)
65
FetchContent_Declare(
76
YAML_CPP
87
GIT_REPOSITORY "https://github.com/jbeder/yaml-cpp.git"
9-
GIT_TAG "yaml-cpp-0.7.0"
8+
GIT_TAG "yaml-cpp-0.6.3"
109
GIT_SHALLOW ON
1110
)
11+
set(YAML_CPP_BUILD_TESTS OFF)
12+
set(YAML_CPP_INSTALL ON)
1213
FetchContent_MakeAvailable(YAML_CPP)
1314

1415
list(APPEND PROJECT_INCLUDE_DIRECTORIES ${YAML_CPP_SOURCE_DIR}/include)
@@ -18,4 +19,4 @@ else()
1819
message(STATUS "YAML_CPP_INCLUDE_DIR: ${YAML_CPP_INCLUDE_DIR}")
1920
endif ()
2021

21-
list(APPEND PROJECT_LINK_LIBRARIES yaml-cpp)
22+
#list(APPEND PROJECT_LINK_LIBRARIES yaml-cpp)

src/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ list(APPEND HEADERS "BasicQA.hpp")
1010
include_directories(${PROJECT_INCLUDE_DIRECTORIES})
1111

1212
add_library(AnalysisTreeQA SHARED ${SOURCES} G__AnalysisTreeQA.cxx)
13-
target_link_libraries(AnalysisTreeQA PUBLIC ${PROJECT_LINK_LIBRARIES})
13+
target_link_libraries(AnalysisTreeQA PUBLIC ${PROJECT_LINK_LIBRARIES} yaml-cpp)
14+
1415
target_include_directories(AnalysisTreeQA PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
1516

1617
ROOT_GENERATE_DICTIONARY(G__AnalysisTreeQA

0 commit comments

Comments
 (0)