Use specific versions of PicoJSON and RtAudio

darbyjohnston · May 7, 2020 · f1242ca · f1242ca
1 parent 63e836c
commit f1242ca
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
diff --git a/cmake/Modules/BuildPicoJSON.cmake b/cmake/Modules/BuildPicoJSON.cmake
@@ -1,9 +1,13 @@
 include(ExternalProject)
 
+# Tag: v1.3.0
+set(PicoJSON_GIT_TAG 25fc213cca61ea22b3c2e4db8def9927562ba5f7)
+
 ExternalProject_Add(
     PicoJSON
     PREFIX ${CMAKE_CURRENT_BINARY_DIR}/PicoJSON
-    URL http://github.com/kazuho/picojson/archive/master.zip
+    GIT_REPOSITORY https://github.com/kazuho/picojson.git
+    GIT_TAG ${PicoJSON_GIT_TAG}
     PATCH_COMMAND
         ${CMAKE_COMMAND} -E copy
             ${CMAKE_SOURCE_DIR}/picojson-patch/CMakeLists.txt

diff --git a/cmake/Modules/BuildRtAudio.cmake b/cmake/Modules/BuildRtAudio.cmake
@@ -1,5 +1,8 @@
 include(ExternalProject)
 
+# Tag: 5.1.0
+set(RtAudio_GIT_TAG d27f257b4bc827e4152cdc4d69a2e22084204afd)
+
 set(RtAudio_ARGS
     -DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
@@ -15,5 +18,5 @@ ExternalProject_Add(
     RtAudio
     PREFIX ${CMAKE_CURRENT_BINARY_DIR}/RtAudio
     GIT_REPOSITORY https://github.com/thestk/rtaudio.git
+    GIT_TAG ${RtAudio_GIT_TAG}
     CMAKE_ARGS ${RtAudio_ARGS})
-
diff --git a/cmake/Modules/FindRtAudio.cmake b/cmake/Modules/FindRtAudio.cmake
@@ -14,7 +14,7 @@
 #
 # * RtAudio
 
-find_path(RtAudio_INCLUDE_DIR NAMES rtaudio/RtAudio.h)
+find_path(RtAudio_INCLUDE_DIR NAMES RtAudio.h)
 set(RtAudio_INCLUDE_DIRS ${RtAudio_INCLUDE_DIR})
 
 if(WIN32)

diff --git a/lib/djvAV/Audio.h b/lib/djvAV/Audio.h
@@ -12,7 +12,7 @@
 //#include <AL/al.h>
 //#include <AL/alc.h>
 //#include <AL/alext.h>
-#include <rtaudio/RtAudio.h>
+#include <RtAudio.h>
 
 #include <limits>
 

diff --git a/lib/djvAV/AudioSystem.cpp b/lib/djvAV/AudioSystem.cpp
@@ -11,7 +11,7 @@
 #include <djvCore/StringFormat.h>
 #include <djvCore/TextSystem.h>
 
-#include <rtaudio/RtAudio.h>
+#include <RtAudio.h>
 
 using namespace djv::Core;
 

diff --git a/lib/djvUI/SettingsSystem.cpp b/lib/djvUI/SettingsSystem.cpp
@@ -24,7 +24,7 @@ namespace djv
         {
             namespace
             {
-                const size_t settingsVersion = 24;
+                const size_t settingsVersion = 25;
 
             } // namespace
 

diff --git a/lib/djvViewApp/Media.h b/lib/djvViewApp/Media.h
@@ -11,7 +11,7 @@
 #include <djvCore/ListObserver.h>
 #include <djvCore/ValueObserver.h>
 
-#include <rtaudio/RtAudio.h>
+#include <RtAudio.h>
 
 namespace djv
 {