Просмотр исходного кода

Add luabind as sub repo, update paths in depends cmakelists

Paul 11 лет назад
Родитель
Сommit
654b0eb916
3 измененных файлов с 8 добавлено и 4 удалено
  1. 3 0
      .gitmodules
  2. 4 4
      dependencies/CMakeLists.txt
  3. 1 0
      dependencies/luabind

+ 3 - 0
.gitmodules

@@ -4,3 +4,6 @@
 [submodule "dependencies/lua"]
 	path = dependencies/lua
 	url = git://github.com/LuaDist/lua.git
+[submodule "dependencies/luabind"]
+	path = dependencies/luabind
+	url = git://github.com/LuaDist/luabind.git

+ 4 - 4
dependencies/CMakeLists.txt

@@ -2,12 +2,12 @@ include_directories(
     ${QGears_INCLUDE_DIRS}
 )
 
-aux_source_directory( lua Lua_FILES )
-aux_source_directory( luabind LuaBind_FILES )
-aux_source_directory( tinyxml TinyXml_FILES )
+aux_source_directory( lua/src Lua_FILES )
+aux_source_directory( luabind/luabind LuaBind_FILES )
+
+add_subdirectory(tinyxml)
 
 add_library(Lua STATIC ${Lua_FILES})
 add_library(LuaBind STATIC ${LuaBind_FILES})
 target_link_libraries(LuaBind Lua)
 
-add_library(TinyXml STATIC ${TinyXml_FILES})

+ 1 - 0
dependencies/luabind

@@ -0,0 +1 @@
+Subproject commit 2387599ea56319235cb2d639331bfbe816629fdc