JasonWang 7 éve
szülő
commit
b4adadc5cd

+ 1 - 1
.gitignore

@@ -32,4 +32,4 @@
 *.app
 
 
-./build
+build/

+ 14 - 1
CMakeLists.txt

@@ -1,4 +1,17 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.0)
+
+if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE)
+  	set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
+	  CACHE STRING "")
+	MESSAGE(STATUS "Using vcpkg")
+endif()
+
 project(traph)
 
+SET(TRAPH_PATH ${PROJECT_SOURCE_DIR} CACHE STRING "Adds a path to TRAPH" FORCE)
+SET(TRAPH_PATH_INCLUDE ${TRAPH_PATH}/traph/include CACHE STRING "Adds a path to TRAPH header" FORCE)
+SET(TRAPH_PATH_HEADER ${TRAPH_PATH_INCLUDE}/traph CACHE STRING "Adds a path to TRAPH header" FORCE)
+SET(TRAPH_PATH_SOURCE ${TRAPH_PATH}/traph/source CACHE STRING "Adds a path to TRAPH source" FORCE)
+SET(TRAPH_PATH_DEPENDENCIES ${TRAPH_PATH}/traph/contrib CACHE STRING "Adds a path to TRAPH dependencies" FORCE)
+
 ADD_SUBDIRECTORY(traph)

+ 7 - 3
build.py

@@ -5,8 +5,12 @@ import sys
 import subprocess
 
 def main(argv):
-    traph_root = argv[0]
-    subprocess.run("cmake .")
-    subprocess.run("cmake .")
+    traph_build = argv[0]
+    traph_root, build_file = os.path.split(traph_build)
+    if not os.path.exists(traph_root + "/build"):
+        os.mkdir("build")
+    os.chdir(traph_root + "/build")
+    subprocess.run("cmake ../")
+    
 if __name__ == '__main__':
 	main(sys.argv)

+ 1 - 0
traph/CMakeLists.txt

@@ -1,2 +1,3 @@
 
+ADD_SUBDIRECTORY(contrib)
 ADD_SUBDIRECTORY(source)

+ 2 - 0
traph/contrib/CMakeLists.txt

@@ -0,0 +1,2 @@
+
+ADD_SUBDIRECTORY(eigen3)

+ 0 - 0
traph/include/core/framework/add.h → traph/include/traph/core/framework/add.h


+ 0 - 0
traph/include/core/framework/assign.h → traph/include/traph/core/framework/assign.h


+ 0 - 0
traph/include/core/framework/constant.h → traph/include/traph/core/framework/constant.h


+ 0 - 0
traph/include/core/framework/op.h → traph/include/traph/core/framework/op.h


+ 0 - 0
traph/include/core/framework/variable.h → traph/include/traph/core/framework/variable.h


+ 2 - 0
traph/source/CMakeLists.txt

@@ -1 +1,3 @@
+INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/traph/include)
+
 ADD_SUBDIRECTORY(core)

+ 14 - 0
traph/source/core/CMakeLists.txt

@@ -0,0 +1,14 @@
+SET(LIB_NAME core)
+SET(LIB_OUTNAME traph-${LIB_NAME})
+
+SET(HEADER_PATH ${TRAPH_PATH_HEADER}/${LIB_NAME})
+SET(SOURCE_PATH ${TRAPH_PATH_SOURCE}/${LIB_NAME})
+
+SET(CORE_LIST
+	${HEADER_PATH}/framework/op.h
+	${SOURCE_PATH}/framework/op.cpp
+)
+
+ADD_LIBRARY(${LIB_OUTNAME} SHARED ${CORE_LIST})
+
+

+ 9 - 0
traph/source/core/framework/op.cpp

@@ -0,0 +1,9 @@
+#include<traph/core/framework/op.h>
+
+namespace traph
+{
+	namespace core
+	{
+
+	}
+}