Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed typo, removed example build

This commit is contained in:
Frank Celler 2016-03-05 14:33:57 +01:00
parent 60cd363f19
commit 6782a5e39d
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3rdParty/boost/CMakeLists.txt vendored
View File

@ -25,7 +25,7 @@ endif ()
if (Boost_UNIT_TEST_FRAMEWORK_FOUND) if (Boost_UNIT_TEST_FRAMEWORK_FOUND)
try_compile( try_compile(
HAVE_USABLE_BOOT_LIBRARIES HAVE_USABLE_BOOST_LIBRARIES
"${CMAKE_BINARY_DIR}/temp" "${CMAKE_BINARY_DIR}/temp"
"${CMAKE_SOURCE_DIR}/cmake/test_boost.cpp" "${CMAKE_SOURCE_DIR}/cmake/test_boost.cpp"
LINK_LIBRARIES LINK_LIBRARIES
@ -34,7 +34,7 @@ if (Boost_UNIT_TEST_FRAMEWORK_FOUND)
"-DINCLUDE_DIRECTORIES=${Boost_INCLUDE_DIR}" "-DINCLUDE_DIRECTORIES=${Boost_INCLUDE_DIR}"
) )
if (HAVE_USABLE_BOOT_LIBRARIES) if (HAVE_USABLE_BOOST_LIBRARIES)
option(USE_BOOST_UNITTESTS "use boost unit-tests" ON) option(USE_BOOST_UNITTESTS "use boost unit-tests" ON)
else () else ()
message(STATUS "cannot use BOOST library ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}") message(STATUS "cannot use BOOST library ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}")

28
3rdParty/zlib/zlib-1.2.8/CMakeLists.txt vendored
View File

@ -241,23 +241,23 @@ endif()
include_directories(${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR}) include_directories(${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR})
add_executable(example EXCLUDE_FROM_ALL test/example.c) # add_executable(example EXCLUDE_FROM_ALL test/example.c)
target_link_libraries(example zlib) # target_link_libraries(example zlib)
add_test(example example) # add_test(example example)
add_executable(minigzip EXCLUDE_FROM_ALL test/minigzip.c) # add_executable(minigzip EXCLUDE_FROM_ALL test/minigzip.c)
target_link_libraries(minigzip zlib) # target_link_libraries(minigzip zlib)
if(HAVE_OFF64_T) # if(HAVE_OFF64_T)
add_executable(example64 test/example.c) # add_executable(example64 test/example.c)
target_link_libraries(example64 zlib) # target_link_libraries(example64 zlib)
set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64") # set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
add_test(example64 example64) # add_test(example64 example64)
add_executable(minigzip64 test/minigzip.c) # add_executable(minigzip64 test/minigzip.c)
target_link_libraries(minigzip64 zlib) # target_link_libraries(minigzip64 zlib)
set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64") # set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
endif() # endif()
set(ZLIB_VERSION set(ZLIB_VERSION
${zlib_VERSION} ${zlib_VERSION}