ソースを参照

added more submodules

submodule
Trevor Irons 6年前
コミット
453b982a9a
5個のファイルの変更29行の追加12行の削除
  1. 6
    0
      .gitmodules
  2. 20
    11
      CMakeLists.txt
  3. 1
    0
      external/CxxTest
  4. 1
    1
      external/eigen
  5. 1
    0
      external/yaml-cpp

+ 6
- 0
.gitmodules ファイルの表示

@@ -1,3 +1,9 @@
1 1
 [submodule "external/eigen"]
2 2
 	path = external/eigen
3 3
 	url = https://github.com/eigenteam/eigen-git-mirror.git
4
+[submodule "external/yaml-cpp"]
5
+	path = external/yaml-cpp
6
+	url = https://github.com/jbeder/yaml-cpp.git
7
+[submodule "external/CxxTest"]
8
+	path = external/CxxTest
9
+	url = https://github.com/CxxTest/cxxtest.git

+ 20
- 11
CMakeLists.txt ファイルの表示

@@ -43,22 +43,31 @@ endif(NOT CMAKE_BUILD_TYPE)
43 43
 ###################
44 44
 # External Projects
45 45
 ###################
46
-include(ExternalProject)
46
+
47 47
 ##########################################################################################
48 48
 # Eigen, this header-library is used extensively for linear algebra, matrices, and arrays
49 49
 # Eigen now has an official mirror on GitHub, so Mercurial is no longer a requirement! 
50
-ExternalProject_Add(EIGEN
51
-	GIT_REPOSITORY "https://github.com/eigenteam/eigen-git-mirror.git"
52
-	UPDATE_COMMAND ""
53
-	GIT_TAG "3.3.3" #"default"
54
-   	PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/eigen
55
-   	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
56
-)
57
-include_directories ("${CMAKE_INSTALL_PREFIX}/include/eigen3")
50
+#ExternalProject_Add(EIGEN
51
+#	GIT_REPOSITORY "https://github.com/eigenteam/eigen-git-mirror.git"
52
+#	UPDATE_COMMAND ""
53
+#	GIT_TAG "3.3.3" #"default"
54
+#   	PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/eigen
55
+#   	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
56
+#)
57
+#include_directories ("${CMAKE_INSTALL_PREFIX}/include/eigen3")
58
+
59
+
60
+####################
61
+# Build SubModules #
62
+####################
63
+include(ExternalProject)
64
+
65
+
66
+
58 67
 
59 68
 #############################################################################################
60 69
 # Yaml-cpp, this library is used extensively for serialisation of classes (class persistence) 
61
-#find_package(yaml-cpp)
70
+find_package(yaml-cpp)
62 71
 if (yaml-cpp_FOUND)
63 72
     message( STATUS "YAML-CPP FOUND ${yaml-cpp_FOUND}" )
64 73
     message( STATUS "YAML-CPP LIBRARIES ${YAML_CPP_LIBRARIES}" )
@@ -76,7 +85,7 @@ else()
76 85
                    -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} 
77 86
     	           -DYAML_CPP_BUILD_TESTS=OFF
78 87
 	)	
79
-	find_package(yaml-cpp)
88
+#	find_package(yaml-cpp)
80 89
 endif()
81 90
 
82 91
 # CxxTest 

+ 1
- 0
external/CxxTest

@@ -0,0 +1 @@
1
+Subproject commit 48bf84df8a84794cbc3919281f7f95663db9217a

+ 1
- 1
external/eigen

@@ -1 +1 @@
1
-Subproject commit d58f73408e2b31dcb4244001df551b71f2aa96b6
1
+Subproject commit 9e97af7de76716c99abdbfd4a4acb182ef098808

+ 1
- 0
external/yaml-cpp

@@ -0,0 +1 @@
1
+Subproject commit 5d5bb52ec2825eb4c0c932a9c2d50dc3699f932f

読み込み中…
キャンセル
保存