diff options
| author | Tor Brede Vekterli <vekterli@yahooinc.com> | 2022-01-27 15:12:59 +0000 |
|---|---|---|
| committer | Tor Brede Vekterli <vekterli@yahooinc.com> | 2022-01-27 15:12:59 +0000 |
| commit | 3a0362bb363e64cc06cb7d2489db399e7938c8ba (patch) | |
| tree | ee79acebcca3d50b2e72abac4d28f6d3767d1554 /functions.cmake | |
| parent | 941d3a6d4d8c1a710669d7dfe0609300833fe6e6 (diff) | |
Normalize dashes in CMake package dependency names to underscores
Packages like `opentelemetry-cpp` export standard CMake variables
in the expected form `OPENTELEMETRY_CPP_LIBRARIES`, _not_ in the
form of `OPENTELEMETRY-CPP_LIBRARIES`. Implicitly normalize dashes
to underscores to fix this.
Diffstat (limited to 'functions.cmake')
| -rw-r--r-- | functions.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/functions.cmake b/functions.cmake index 1ec68a4585f..65c02885ddb 100644 --- a/functions.cmake +++ b/functions.cmake @@ -51,6 +51,7 @@ endfunction() function(vespa_add_package_dependency PACKAGE_NAME) find_package(${PACKAGE_NAME} REQUIRED) string(TOUPPER ${PACKAGE_NAME} PACKAGE_NAME) + string(REPLACE "-" "_" PACKAGE_NAME ${PACKAGE_NAME}) set(PACKAGE_INCLUDE_DIR ${${PACKAGE_NAME}_INCLUDE_DIR}) set(PACKAGE_LIBRARIES ${${PACKAGE_NAME}_LIBRARIES}) link_libraries(${PACKAGE_LIBRARIES}) @@ -61,6 +62,7 @@ endfunction() function(vespa_add_target_package_dependency TARGET PACKAGE_NAME) find_package(${PACKAGE_NAME} REQUIRED) string(TOUPPER ${PACKAGE_NAME} PACKAGE_NAME) + string(REPLACE "-" "_" PACKAGE_NAME ${PACKAGE_NAME}) set(PACKAGE_INCLUDE_DIR ${${PACKAGE_NAME}_INCLUDE_DIR}) set(PACKAGE_LIBRARIES ${${PACKAGE_NAME}_LIBRARIES}) target_link_libraries(${TARGET} PUBLIC ${PACKAGE_LIBRARIES}) |