Skip to content

Commit

Permalink
Merge #206: cmake: Disable EXPORT_COMPILE_COMMANDS for all subtree …
Browse files Browse the repository at this point in the history
…targets

a37b0df fixup! cmake: Build `secp256k1` static library (Hennadii Stepanov)
4883df5 fixup! cmake: Build `crc32c` static library (Hennadii Stepanov)

Pull request description:

  Fixes the second point from bitcoin#29790 (comment):
  >    2. Missed disabling `EXPORT_COMPILE_COMMANDS` property for targets in the `crc32c` subtree.

Top commit has no ACKs.

Tree-SHA512: 231cda1190faab44f0b0ec72de1ed4abd0f490026c781b26d9ea374995db0d5d00d575c23e8775057a1c59ee1fbf7dcb0b58109ead3051c1ee23e243d852524d
  • Loading branch information
hebasto committed May 23, 2024
2 parents 23a084e + a37b0df commit 6c2be70
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
3 changes: 3 additions & 0 deletions cmake/crc32c.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ target_include_directories(crc32c
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/crc32c/include>
)
target_link_libraries(crc32c PRIVATE crc32c_common)
set_target_properties(crc32c PROPERTIES EXPORT_COMPILE_COMMANDS OFF)

if(HAVE_SSE42)
add_library(crc32c_sse42 STATIC EXCLUDE_FROM_ALL
Expand All @@ -104,6 +105,7 @@ if(HAVE_SSE42)
target_compile_definitions(crc32c_sse42 PUBLIC HAVE_SSE42=1)
target_compile_options(crc32c_sse42 PRIVATE ${SSE42_CXXFLAGS})
target_link_libraries(crc32c_sse42 PRIVATE crc32c_common)
set_target_properties(crc32c_sse42 PROPERTIES EXPORT_COMPILE_COMMANDS OFF)
target_link_libraries(crc32c PRIVATE crc32c_sse42)
endif()

Expand All @@ -114,5 +116,6 @@ if(HAVE_ARM64_CRC32C)
target_compile_definitions(crc32c_arm64 PUBLIC HAVE_ARM64_CRC32C=1)
target_compile_options(crc32c_arm64 PRIVATE ${ARM64_CRC_CXXFLAGS})
target_link_libraries(crc32c_arm64 PRIVATE crc32c_common)
set_target_properties(crc32c_arm64 PROPERTIES EXPORT_COMPILE_COMMANDS OFF)
target_link_libraries(crc32c PRIVATE crc32c_arm64)
endif()
1 change: 1 addition & 0 deletions cmake/secp256k1.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,4 @@ if(MSVC)
endif()

target_link_libraries(secp256k1 PRIVATE core_base_interface)
set_target_properties(secp256k1 PROPERTIES EXPORT_COMPILE_COMMANDS OFF)

0 comments on commit 6c2be70

Please sign in to comment.