Renaming ROC branch var and moving to root cmakefile

roc-streaming · Dec 31, 2023 · d674cfa · d674cfa
1 parent 7f109ab
commit d674cfa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,6 +10,7 @@ define_option(ROC_LIB_DIR "" STRING "roc toolkit library directory")
 define_option(DOWNLOAD_ROC ON BOOL "automatically download and build roc-toolkit")
 
 if(DOWNLOAD_ROC)
+  define_option(ROC_BRANCH "master" STRING "roc-toolkit branch")
   include("cmake/download_roc.cmake")
 else()
   if(NOT ROC_INCLUDE_DIR STREQUAL "")

diff --git a/cmake/download_roc.cmake b/cmake/download_roc.cmake
@@ -27,11 +27,10 @@ set(SCONS_CMD
   #"STRIP=${CMAKE_STRIP}"
 )  
 
-define_option(ROC_TOOLKIT_BRANCH "master" STRING "roc-toolkit branch")
 
 ExternalProject_Add(RocLibrary
   GIT_REPOSITORY "https://github.com/roc-streaming/roc-toolkit.git"
-  GIT_TAG origin/${ROC_TOOLKIT_BRANCH}
+  GIT_TAG origin/${ROC_BRANCH}
   SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/roc-src"
   INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/roc-prefix"
   BUILD_IN_SOURCE ON