Skip to content

Commit 2221314

Browse files
authored
Fix travis (r9y9#2)
* Fix travis * support for r9y9/hts_engine_API * oops
1 parent f6ae48b commit 2221314

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ before_install:
1515
# Just check if build success or not for now
1616
script:
1717
- cd src
18-
- ./waf configure
19-
- ./waf build
18+
- mkdir -p build && cd build
19+
- cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON ..
20+
- make -j
2021

2122
notifications:
2223
email: false

src/CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,12 @@ endif()
9494

9595
# find HTSEngine
9696
find_path(HTS_ENGINE_INCLUDE_DIR HTS_engine.h)
97-
find_library(HTS_ENGINE_LIB HTSEngine)
97+
find_library(HTS_ENGINE_LIB hts_engine_API)
98+
if(NOT HTS_ENGINE_LIB)
99+
# fallback
100+
find_library(HTS_ENGINE_LIB HTSEngine)
101+
endif()
102+
98103
if(HTS_ENGINE_INCLUDE_DIR AND HTS_ENGINE_LIB)
99104
target_link_libraries(openjtalk ${HTS_ENGINE_LIB})
100105
include_directories(openjtalk ${HTS_ENGINE_INCLUDE_DIR})

0 commit comments

Comments
 (0)