diff options
| author | Marcin Junczys-Dowmunt <junczys@amu.edu.pl> | 2017-03-23 22:55:53 +0300 |
|---|---|---|
| committer | Marcin Junczys-Dowmunt <junczys@amu.edu.pl> | 2017-03-23 22:55:53 +0300 |
| commit | aebb03dfe2c2ef7e16e49a903a4ee2f1995bdad9 (patch) | |
| tree | 86eb2cfce6a49e9f08b16f2a1fbe5e78abd3704b | |
| parent | 619a8638b5a921cd83a3d5ec78455598c608c8a7 (diff) | |
add -amun suffix to yaml-cpp
| -rw-r--r-- | src/3rd_party/yaml-cpp/CMakeLists.txt | 4 | ||||
| -rwxr-xr-x | src/CMakeLists.txt | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/3rd_party/yaml-cpp/CMakeLists.txt b/src/3rd_party/yaml-cpp/CMakeLists.txt index f2d6acec..f42a3c53 100644 --- a/src/3rd_party/yaml-cpp/CMakeLists.txt +++ b/src/3rd_party/yaml-cpp/CMakeLists.txt @@ -1,7 +1,7 @@ include_directories(..) include_directories(.) -if (NOT TARGET libyaml-cpp) - add_library(libyaml-cpp OBJECT +if (NOT TARGET libyaml-cpp-amun) + add_library(libyaml-cpp-amun OBJECT regex_yaml.cpp nodebuilder.cpp scanscalar.cpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 89f2ed7c..f4458a4a 100755 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories(.) include_directories(3rd_party) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/common/git_version.cpp.in" - "${CMAKE_CURRENT_BINARY_DIR}/common/git_version.cpp" @ONLY) + "${CMAKE_CURRENT_BINARY_DIR}/common/git_version.cpp" @ONLY) list(APPEND SOURCES "${CMAKE_CURRENT_BINARY_DIR}/common/git_version.cpp") @@ -60,7 +60,7 @@ cuda_add_executable( common/loader_factory.cpp $<TARGET_OBJECTS:libcommon> $<TARGET_OBJECTS:cpumode> - $<TARGET_OBJECTS:libyaml-cpp> + $<TARGET_OBJECTS:libyaml-cpp-amun> $<TARGET_OBJECTS:libcnpy> ) @@ -79,7 +79,7 @@ cuda_add_library(python SHARED $<TARGET_OBJECTS:libcommon> $<TARGET_OBJECTS:libcnpy> $<TARGET_OBJECTS:cpumode> - $<TARGET_OBJECTS:libyaml-cpp> + $<TARGET_OBJECTS:libyaml-cpp-amun> ) set_target_properties("python" PROPERTIES EXCLUDE_FROM_ALL 1) set_target_properties("python" PROPERTIES OUTPUT_NAME "amunmt") @@ -102,7 +102,7 @@ cuda_add_library(mosesplugin STATIC $<TARGET_OBJECTS:libcommon> $<TARGET_OBJECTS:libcnpy> $<TARGET_OBJECTS:cpumode> - $<TARGET_OBJECTS:libyaml-cpp> + $<TARGET_OBJECTS:libyaml-cpp-amun> ) set_target_properties("mosesplugin" PROPERTIES EXCLUDE_FROM_ALL 1) @@ -115,7 +115,7 @@ add_executable( $<TARGET_OBJECTS:libcnpy> $<TARGET_OBJECTS:cpumode> $<TARGET_OBJECTS:libcommon> - $<TARGET_OBJECTS:libyaml-cpp> + $<TARGET_OBJECTS:libyaml-cpp-amun> ) if(PYTHONLIBS_FOUND) @@ -125,7 +125,7 @@ add_library(python SHARED $<TARGET_OBJECTS:libcnpy> $<TARGET_OBJECTS:cpumode> $<TARGET_OBJECTS:libcommon> - $<TARGET_OBJECTS:libyaml-cpp> + $<TARGET_OBJECTS:libyaml-cpp-amun> ) set_target_properties("python" PROPERTIES EXCLUDE_FROM_ALL 1) set_target_properties("python" PROPERTIES OUTPUT_NAME "amunmt") |