Navigation Menu

Skip to content

Commit

Permalink
cmake: remove needless code to use bundled libraries
Browse files Browse the repository at this point in the history
It's done in Groonga.
  • Loading branch information
kou committed Mar 24, 2019
1 parent b620e43 commit 7df5b54
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 16 deletions.
14 changes: 0 additions & 14 deletions CMakeLists.txt
Expand Up @@ -106,20 +106,6 @@ if(MRN_GROONGA_BUNDLED)
set(GROONGA_NORMALIZER_MYSQL_EMBED ON)
endif()

file(READ "${MRN_BUNDLED_GROONGA_DIR}/bundled_lz4_version"
MRN_BUNDLED_LZ4_VERSION)
string(STRIP
"${MRN_BUNDLED_LZ4_VERSION}"
MRN_BUNDLED_LZ4_VERSION)
set(MRN_BUNDLED_LZ4_DIR
"${MRN_BUNDLED_GROONGA_DIR}/vendor/lz4-${MRN_BUNDLED_LZ4_VERSION}")
if(EXISTS ${MRN_BUNDLED_LZ4_DIR})
set(GRN_WITH_BUNDLED_LZ4 ON)
set(GRN_WITH_LZ4 "yes")
else()
set(GRN_WITH_LZ4 "no")
endif()

add_subdirectory("${MRN_BUNDLED_GROONGA_RELATIVE_DIR}")
else()
set(MRN_GROONGA_EMBED OFF)
Expand Down
2 changes: 0 additions & 2 deletions appveyor.yml
Expand Up @@ -57,8 +57,6 @@ build_script:
- cmake ..\source -G "%CMAKE_GENERATOR_NAME%"
-DMRN_GROONGA_EMBED=OFF
-DMRN_GROONGA_NORMALIZER_MYSQL_EMBED=OFF
-DGRN_WITH_BUNDLED_LZ4=ON
-DGRN_WITH_BUNDLED_MECAB=ON
- cmake --build . --config RelWithDebInfo
- cmake --build . --config RelWithDebInfo --target package
- move *.zip ..\
Expand Down

0 comments on commit 7df5b54

Please sign in to comment.