Skip to content

Very minor changes to conanfile and CMakeLists.txt #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
greensky00 merged 2 commits into from
Mar 17, 2025
Merged

Very minor changes to conanfile and CMakeLists.txt #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
332f206
specify library name explicitely in conanfile based on option.shared …
yfinkelstein-ebay Mar 15, 2025
99d2529
removed leftovers of COUCHBASE_SERVER_BUILD
yfinkelstein-ebay Mar 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ tests/mempool_test
wt2
CMakeUserPresets.json
compile_commands.json
.cache/
.cache/
.build_success*
18 changes: 8 additions & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,14 +297,12 @@ target_link_libraries(forestdb_hexamine ${PTHREAD_LIB} ${LIBM} ${SNAPPY_LIBRARIE
${DL_LIBRARIES} ${BREAKPAD_LIBRARIES})
set_target_properties(forestdb_hexamine PROPERTIES COMPILE_FLAGS "-D_FDB_TOOLS")

if((NOT COUCHBASE_SERVER_BUILD) OR (INSTALL_HEADER_FILES))
install(FILES
include/libforestdb/forestdb.h
include/libforestdb/fdb_types.h
include/libforestdb/fdb_errors.h
${CMAKE_CURRENT_BINARY_DIR}/src/config.h
DESTINATION include/libforestdb)
endif((NOT COUCHBASE_SERVER_BUILD) OR (INSTALL_HEADER_FILES))
install(FILES
include/libforestdb/forestdb.h
include/libforestdb/fdb_types.h
include/libforestdb/fdb_errors.h
${CMAKE_CURRENT_BINARY_DIR}/src/config.h
DESTINATION include/libforestdb)

install(TARGETS static_lib
RUNTIME DESTINATION bin
Expand All @@ -315,10 +313,10 @@ install(TARGETS forestdb_dump
RUNTIME DESTINATION bin)

if("${CMAKE_BUILD_TYPE}" STREQUAL "Coverage")
if((NOT COUCHBASE_SERVER_BUILD) AND (NOT WIN32))
if(NOT WIN32)
include(cmake/Modules/CodeCoverage)
SETUP_TARGET_FOR_COVERAGE(test_coverage ctest ${PROJECT_SOURCE_DIR}/coverage)
endif((NOT COUCHBASE_SERVER_BUILD) AND (NOT WIN32))
endif()
endif()

if(("${CMAKE_BUILD_TYPE}" STREQUAL "Valgrind") AND (NOT WIN32))
Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def requirements(self):

def layout(self):
cmake_layout(self, generator="CMakeDeps")
self.cpp.package.libs = [self.name]
self.cpp.package.libs = [f"lib{self.name}.so" if self.options.shared else f"lib{self.name}.a"]

hash = Git(self).get_commit()
self.cpp.package.defines = self.cpp.build.defines = ["_FDB_COMMIT_HASH=%s" % hash]
Expand Down