Issue #3370 Broken CMakeLists.txt
Summary: Issue #3370 Simple fixes to make RocksDB project working also as a submodule of other bigger one. Closes https://github.com/facebook/rocksdb/pull/3372 Differential Revision: D6729595 Pulled By: ajkr fbshipit-source-id: eee2589e7a7c4322873dff8510eebd050301c54c
This commit is contained in:
parent
af92d4ad11
commit
bf6f03f3cd
|
@ -39,7 +39,7 @@ if(POLICY CMP0042)
|
||||||
cmake_policy(SET CMP0042 NEW)
|
cmake_policy(SET CMP0042 NEW)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/")
|
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules/")
|
||||||
|
|
||||||
option(WITH_JEMALLOC "build with JeMalloc" OFF)
|
option(WITH_JEMALLOC "build with JeMalloc" OFF)
|
||||||
option(WITH_SNAPPY "build with SNAPPY" OFF)
|
option(WITH_SNAPPY "build with SNAPPY" OFF)
|
||||||
|
@ -720,7 +720,7 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS)
|
||||||
set(package_config_destination ${CMAKE_INSTALL_LIBDIR}/cmake/rocksdb)
|
set(package_config_destination ${CMAKE_INSTALL_LIBDIR}/cmake/rocksdb)
|
||||||
|
|
||||||
configure_package_config_file(
|
configure_package_config_file(
|
||||||
${CMAKE_SOURCE_DIR}/cmake/RocksDBConfig.cmake.in RocksDBConfig.cmake
|
${CMAKE_CURRENT_LIST_DIR}/cmake/RocksDBConfig.cmake.in RocksDBConfig.cmake
|
||||||
INSTALL_DESTINATION ${package_config_destination}
|
INSTALL_DESTINATION ${package_config_destination}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -950,17 +950,18 @@ if(WITH_TESTS)
|
||||||
|
|
||||||
foreach(sourcefile ${TEST_EXES})
|
foreach(sourcefile ${TEST_EXES})
|
||||||
get_filename_component(exename ${sourcefile} NAME_WE)
|
get_filename_component(exename ${sourcefile} NAME_WE)
|
||||||
add_executable(${exename}${ARTIFACT_SUFFIX} ${sourcefile}
|
add_executable(${CMAKE_PROJECT_NAME}_${exename}${ARTIFACT_SUFFIX} ${sourcefile}
|
||||||
$<TARGET_OBJECTS:testharness>)
|
$<TARGET_OBJECTS:testharness>)
|
||||||
set_target_properties(${exename}${ARTIFACT_SUFFIX}
|
set_target_properties(${CMAKE_PROJECT_NAME}_${exename}${ARTIFACT_SUFFIX}
|
||||||
PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD_RELEASE 1
|
PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD_RELEASE 1
|
||||||
EXCLUDE_FROM_DEFAULT_BUILD_MINRELEASE 1
|
EXCLUDE_FROM_DEFAULT_BUILD_MINRELEASE 1
|
||||||
EXCLUDE_FROM_DEFAULT_BUILD_RELWITHDEBINFO 1
|
EXCLUDE_FROM_DEFAULT_BUILD_RELWITHDEBINFO 1
|
||||||
|
OUTPUT_NAME ${exename}${ARTIFACT_SUFFIX}
|
||||||
)
|
)
|
||||||
target_link_libraries(${exename}${ARTIFACT_SUFFIX} testutillib${ARTIFACT_SUFFIX} gtest ${LIBS})
|
target_link_libraries(${CMAKE_PROJECT_NAME}_${exename}${ARTIFACT_SUFFIX} testutillib${ARTIFACT_SUFFIX} gtest ${LIBS})
|
||||||
if(NOT "${exename}" MATCHES "db_sanity_test")
|
if(NOT "${exename}" MATCHES "db_sanity_test")
|
||||||
add_test(NAME ${exename} COMMAND ${exename}${ARTIFACT_SUFFIX})
|
add_test(NAME ${exename} COMMAND ${exename}${ARTIFACT_SUFFIX})
|
||||||
add_dependencies(check ${exename}${ARTIFACT_SUFFIX})
|
add_dependencies(check ${CMAKE_PROJECT_NAME}_${exename}${ARTIFACT_SUFFIX})
|
||||||
endif()
|
endif()
|
||||||
endforeach(sourcefile ${TEST_EXES})
|
endforeach(sourcefile ${TEST_EXES})
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user