Merge pull request #41 from cameronwhite/submodules

Fix #40 - Use submodules for third-party libraries.
powertab · Jul 26, 2014 · 4572ce8 · 4572ce8
2 parents c285e5e + fbb43c0
commit 4572ce8
Show file tree

Hide file tree

Showing 39 changed files with 155 additions and 27,626 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,12 @@
+[submodule "external/Catch"]
+	path = external/Catch
+	url = git://github.com/philsquared/Catch.git
+[submodule "external/rtmidi"]
+	path = external/rtmidi
+	url = git://github.com/thestk/rtmidi.git
+[submodule "external/rapidjson"]
+	path = external/rapidjson
+	url = git://github.com/miloyip/rapidjson.git
+[submodule "external/pugixml"]
+	path = external/pugixml
+	url = git://github.com/zeux/pugixml.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -35,6 +35,16 @@ else()
     endif()
 endif()
 
+# Configure backends for RtMidi.
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    add_definitions(-D__LINUX_ALSA__)
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    add_definitions(-D__MACOSX_AU__)
+    add_definitions(-D__MACOSX_CORE__)
+elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+    add_definitions(-D__WINDOWS_MM__)
+endif()
+
 # Run moc automatically when needed.
 set(CMAKE_AUTOMOC ON)
 
@@ -54,6 +64,9 @@ endif()
 
 include_directories(${Boost_INCLUDE_DIRS})
 include_directories(${PROJECT_SOURCE_DIR}/source)
+include_directories(${PROJECT_SOURCE_DIR}/external/rapidjson/include)
+include_directories(${PROJECT_SOURCE_DIR}/external/pugixml/src)
 
+add_subdirectory(external)
 add_subdirectory(source)
 add_subdirectory(test)
diff --git a/README.md b/README.md
@@ -3,6 +3,12 @@
 [![Build Status](https://travis-ci.org/powertab/powertabeditor.svg?branch=master)](https://travis-ci.org/powertab/powertabeditor)
 
 ### Compiling
+####Getting the code:
+
+Use `git clone --recursive` to initialize submodules in the `external` folder:
+
+`git clone --recursive git://github.com/powertab/powertabeditor.git`
+
 ####Dependencies:
 * [CMake](http://www.cmake.org/) >= 2.8.9
 * [Boost 1.55](http://www.boost.org/)
@@ -68,4 +74,4 @@
 * Run:
   * `./bin/powertabeditor`
   * `./bin/pte_tests` to run the unit tests.
-
+
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 2.8.9)
+
+add_library(rtmidi
+    rtmidi/RtMidi.cpp
+
+    rtmidi/RtError.h
+    rtmidi/RtMidi.h
+)
+
+add_library(pugixml
+    pugixml/src/pugixml.cpp
+
+    pugixml/src/pugixml.hpp
+)
diff --git a/external/Catch b/external/Catch
diff --git a/external/pugixml b/external/pugixml
diff --git a/external/rapidjson b/external/rapidjson
diff --git a/external/rtmidi b/external/rtmidi
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
@@ -33,6 +33,7 @@ target_link_libraries(powertabeditor
     pteformats
     pteactions
     ptescore
+    pugixml
     ${Boost_LIBRARIES}
     ${ZLIB_LIBRARIES}
 )

diff --git a/source/app/CMakeLists.txt b/source/app/CMakeLists.txt
@@ -1,7 +1,5 @@
 cmake_minimum_required(VERSION 2.8.9)
 
-include_directories(.)
-
 # Get a version number.
 include(FindGit)
 execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --long OUTPUT_VARIABLE MY_WC_REVISION)

diff --git a/source/audio/CMakeLists.txt b/source/audio/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 2.8.9)
 
+include_directories(${PROJECT_SOURCE_DIR}/external/rtmidi)
+
 add_library(pteaudio
     bendevent.cpp
     letringevent.cpp
@@ -30,5 +32,3 @@ add_library(pteaudio
 
 qt5_use_modules(pteaudio Widgets) 
 cotire(pteaudio)
-
-add_subdirectory(rtmidi)
diff --git a/source/audio/midioutputdevice.cpp b/source/audio/midioutputdevice.cpp
@@ -17,7 +17,7 @@
 
 #include "midioutputdevice.h"
 
-#include "rtmidi/RtMidi.h"
+#include <RtMidi.h>
 #include <score/dynamic.h>
 #include <score/generalmidi.h>
 

diff --git a/source/audio/rtmidi/CMakeLists.txt b/source/audio/rtmidi/CMakeLists.txt
diff --git a/source/audio/rtmidi/RtError.h b/source/audio/rtmidi/RtError.h