diff options
| author | Marcin Junczys-Dowmunt <junczys@amu.edu.pl> | 2017-03-23 23:06:06 +0300 |
|---|---|---|
| committer | Marcin Junczys-Dowmunt <junczys@amu.edu.pl> | 2017-03-23 23:06:06 +0300 |
| commit | 427d750723d8261e5fde832eb1fca32185de3c10 (patch) | |
| tree | 2073b85c35e86c7a2f2fb37e59ec678713909878 | |
| parent | 8bb065ddc8ead9045ac27155d46bf4e8145e9d0e (diff) | |
change path
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| m--------- | marian | 6 | ||||
| -rwxr-xr-x | src/CMakeLists.txt | 6 |
4 files changed, 8 insertions, 9 deletions
diff --git a/.gitmodules b/.gitmodules index 41746d64..db2150a9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "submodules/marian"] - path = marian.src +[submodule "src/marian"] + path = src/marian url = http://github.com/amunmt/marian diff --git a/CMakeLists.txt b/CMakeLists.txt index 38bb502a..5d2adf5c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,6 @@ if(CUDA) if (MARIAN) execute_process(COMMAND git submodule update --init --recursive WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - add_subdirectory(marian) endif(MARIAN) else(CUDA_FOUND) diff --git a/marian b/marian deleted file mode 160000 -Subproject ba91eda85d33a60f8bb01c964afcbb45a46b3b8 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f4458a4a..9dafb4f2 100755 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -42,6 +42,12 @@ add_library(libcommon OBJECT if(CUDA_FOUND) +if (MARIAN) + #execute_process(COMMAND git submodule update --init --recursive +# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + add_subdirectory(marian) +endif(MARIAN) + set_source_files_properties( common/loader_factory.cpp PROPERTIES CUDA_SOURCE_PROPERTY_FORMAT OBJ ) |