cherry-pick master changes (#1529)

* cmake: add OPAE_LEGACY_TAG Specifies which branch in opae-legacy to load when refreshing the external repository. * cmake: add OPAE_LEGACY_TAG Specifies which branch in opae-legacy to load when refreshing the external repository. * Merge commit '58e7e81ab124a779bd547852f58e845c7ac1895c' into tswhison/legacy_tag * Merge pull request #1527 from OPAE/tswhison/legacy_tag Tswhison/legacy tag Co-authored-by: Tim Whisonant <tim.whisonant@intel.com>
OFS · Apr 15, 2020 · 415f4eb · 415f4eb
1 parent a38a5f8
commit 415f4eb
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,6 +39,11 @@ include(OPAE)
 option(OPAE_BUILD_LEGACY "Enable building of OPAE legacy tools" OFF)
 mark_as_advanced(OPAE_BUILD_LEGACY)
 
+if(OPAE_BUILD_LEGACY)
+    option(OPAE_LEGACY_TAG "Desired branch for opae-legacy" master)
+    mark_as_advanced(OPAE_LEGACY_TAG)
+endif(OPAE_BUILD_LEGACY)
+
 ############################################################################
 ## Other setup and dependencies ############################################
 ############################################################################

diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -28,5 +28,8 @@ cmake_minimum_required(VERSION 2.8.12)
 
 if(OPAE_BUILD_LEGACY)
     opae_external_project_add(PROJECT_NAME opae-legacy
-                              GIT_URL https://github.com/OPAE/opae-legacy.git)
+                              GIT_URL https://github.com/OPAE/opae-legacy.git
+                              GIT_TAG ${OPAE_LEGACY_TAG}
+                              PRESERVE_REPOS ${OPAE_PRESERVE_REPOS})
+
 endif(OPAE_BUILD_LEGACY)
diff --git a/opae-libs/CMakeLists.txt b/opae-libs/CMakeLists.txt
@@ -98,6 +98,16 @@ mark_as_advanced(OPAE_BUILD_SIM)
 option(OPAE_PRESERVE_REPOS "Disable refresh of external repos" OFF)
 mark_as_advanced(OPAE_PRESERVE_REPOS)
 
+if(OPAE_BUILD_TESTS)
+    option(OPAE_TEST_TAG "Desired branch for opae-test" master)
+    mark_as_advanced(OPAE_TEST_TAG)
+endif(OPAE_BUILD_TESTS)
+
+if(OPAE_BUILD_SIM)
+    option(OPAE_SIM_TAG "Desired branch for opae-sim" master)
+    mark_as_advanced(OPAE_SIM_TAG)
+endif(OPAE_BUILD_SIM)
+
 ############################################################################
 ## Add Subdirectories ######################################################
 ############################################################################

diff --git a/opae-libs/external/CMakeLists.txt b/opae-libs/external/CMakeLists.txt
@@ -29,11 +29,13 @@ cmake_minimum_required(VERSION 2.8.12)
 if(OPAE_BUILD_TESTS)
     opae_external_project_add(PROJECT_NAME opae-test
                               GIT_URL https://github.com/OPAE/opae-test.git
+                              GIT_TAG ${OPAE_TEST_TAG}
                               PRESERVE_REPOS ${OPAE_PRESERVE_REPOS})
 endif(OPAE_BUILD_TESTS)
 
 if(OPAE_BUILD_SIM)
     opae_external_project_add(PROJECT_NAME opae-sim
                               GIT_URL https://github.com/OPAE/opae-sim.git
+                              GIT_TAG ${OPAE_SIM_TAG}
                               PRESERVE_REPOS ${OPAE_PRESERVE_REPOS})
 endif(OPAE_BUILD_SIM)