resolve yaml-cpp relative to root

rstudio · Jan 20, 2021 · cffa3dd · cffa3dd
1 parent 43a82e0
commit cffa3dd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CMakeGlobals.txt b/CMakeGlobals.txt
@@ -21,6 +21,9 @@ if(RSTUDIO_CMAKE_GLOBALS_INCLUDED)
 endif()
 set(RSTUDIO_CMAKE_GLOBALS_INCLUDED YES)
 
+# root directory
+set(RSTUDIO_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}")
+
 # version info
 if ("$ENV{RSTUDIO_VERSION_MAJOR}" STREQUAL "")
   set(CPACK_PACKAGE_VERSION_MAJOR "99")

diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
@@ -208,7 +208,7 @@ if(WIN32)
 
 else()
 
-   set(YAML_CPP_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../dependencies/common")
+   set(YAML_CPP_ROOT "${RSTUDIO_ROOT_DIR}/dependencies/common")
    set(YAML_CPP_INCLUDE_DIR "${YAML_CPP_ROOT}/yaml-cpp/0.6.3/include")
    set(YAML_CPP_LIBRARIES "${YAML_CPP_ROOT}/yaml-cpp/0.6.3/build/libyaml-cpp.a")