diff options
| author | hieuhoang1972 <hieuhoang1972@9a26d1b7-1c8f-445c-8fdd-6576f508279d> | 2012-06-22 13:00:24 +0400 |
|---|---|---|
| committer | hieuhoang1972 <hieuhoang1972@9a26d1b7-1c8f-445c-8fdd-6576f508279d> | 2012-06-22 13:00:24 +0400 |
| commit | 5186ab7cd9fa67a6a21711317fced9aeef148596 (patch) | |
| tree | 30056939986474bda5d05357eb10cd67f0f79d6c | |
| parent | 5ed635a492fdf944dbe93ae4d7a9829dc67740b8 (diff) | |
consistent naming of mgiza between automake & cmake
| -rw-r--r-- | mgizapp/src/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | mgizapp/src/Makefile.am | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/mgizapp/src/CMakeLists.txt b/mgizapp/src/CMakeLists.txt index 33f6b08..c86312b 100644 --- a/mgizapp/src/CMakeLists.txt +++ b/mgizapp/src/CMakeLists.txt @@ -63,7 +63,9 @@ SET( LIBMGIZA_SRC vocab.h WordClasses.h ) -ADD_LIBRARY(mgiza STATIC ${LIBMGIZA_SRC}) +ADD_LIBRARY(mgiza_lib STATIC ${LIBMGIZA_SRC}) +SET_TARGET_PROPERTIES(mgiza_lib PROPERTIES OUTPUT_NAME "mgiza") + INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR} ) IF (WIN32) INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/w32 ) @@ -81,11 +83,11 @@ LINK_DIRECTORIES ( ${LIBRARY_OUTPUT_PATH} ) SET( MGIZA_SRC main.cpp ) -ADD_EXECUTABLE( mgizapp ${MGIZA_SRC} ) +ADD_EXECUTABLE( mgiza ${MGIZA_SRC} ) TARGET_LINK_LIBRARIES ( - mgizapp mgiza + mgiza_lib ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) @@ -100,18 +102,18 @@ ADD_EXECUTABLE(hmmnorm hmmnorm.cxx) ADD_EXECUTABLE(d4norm d4norm.cxx) TARGET_LINK_LIBRARIES ( hmmnorm - mgiza + mgiza_lib ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) TARGET_LINK_LIBRARIES ( d4norm - mgiza + mgiza_lib ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) -INSTALL(TARGETS mgiza mgizapp snt2cooc snt2plain plain2snt symal hmmnorm d4norm snt2coocrmp +INSTALL(TARGETS mgiza_lib mgiza snt2cooc snt2plain plain2snt symal hmmnorm d4norm snt2coocrmp RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib diff --git a/mgizapp/src/Makefile.am b/mgizapp/src/Makefile.am index 90ca9a8..77271ff 100644 --- a/mgizapp/src/Makefile.am +++ b/mgizapp/src/Makefile.am @@ -121,7 +121,7 @@ mgiza_CPPFLAGS = \ -DDEBUG mgiza_LDFLAGS = \ - -L. + -L. -lboost_thread-mt mgiza_LDADD = \ -lgiza \ |