diff options
| author | Radek Novacek <rnovacek@redhat.com> | 2013-09-26 08:48:45 +0200 |
|---|---|---|
| committer | Radek Novacek <rnovacek@redhat.com> | 2013-09-26 09:11:59 +0200 |
| commit | d5aa7d41462f75eea4894325a203cbcb4dc1e123 (patch) | |
| tree | 4cf84a4c52ad0f3b0f3972ec5e4038fac5ed00a8 /cmake | |
| parent | 19edb566554ee5bc463cd14fe7ebfd45d942fbdc (diff) | |
| download | openlmi-providers-d5aa7d41462f75eea4894325a203cbcb4dc1e123.tar.gz openlmi-providers-d5aa7d41462f75eea4894325a203cbcb4dc1e123.tar.xz openlmi-providers-d5aa7d41462f75eea4894325a203cbcb4dc1e123.zip | |
cmake: search for openlmi-mof-register in the /usr/local dir
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindOpenLMI.cmake | 13 | ||||
| -rw-r--r-- | cmake/modules/OpenLMIMacros.cmake | 6 |
2 files changed, 12 insertions, 7 deletions
diff --git a/cmake/modules/FindOpenLMI.cmake b/cmake/modules/FindOpenLMI.cmake index 3a83f32..abf83a9 100644 --- a/cmake/modules/FindOpenLMI.cmake +++ b/cmake/modules/FindOpenLMI.cmake @@ -27,9 +27,20 @@ find_library(OPENLMICOMMON_LIBRARY PATHS /usr /usr/local ) +find_program(OPENLMI_MOF_REGISTER + NAMES openlmi-mof-register + HINTS $ENV{OPENLMI_MOF_REGISTER} + PATH_SUFFIXES bin + PATHS ${CMAKE_SOURCE_DIR} /usr /usr/local +) + set(OPENLMI_LIBRARIES ${OPENLMICOMMON_LIBRARY}) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(OPENLMI DEFAULT_MSG OPENLMI_LIBRARIES OPENLMI_INCLUDE_DIR) +find_package_handle_standard_args(OPENLMI + REQUIRED_VARS OPENLMI_LIBRARIES OPENLMI_INCLUDE_DIR + OPENLMI_QUALIFIERS_MOF OPENLMI_JOBS_MOF + OPENLMI_MOF_REGISTER + VERSION_VAR OPENLMI_VERSION) mark_as_advanced(OPENLMI_INCLUDE_DIR OPENLMI_LIBRARIES) diff --git a/cmake/modules/OpenLMIMacros.cmake b/cmake/modules/OpenLMIMacros.cmake index 8597495..98a9dd3 100644 --- a/cmake/modules/OpenLMIMacros.cmake +++ b/cmake/modules/OpenLMIMacros.cmake @@ -144,12 +144,6 @@ macro(cim_registration PROVIDER_NAME LIBRARY_NAME MOF DEST) PATHS ${CMAKE_SOURCE_DIR}/mof/ ) - find_file(OPENLMI_MOF_REGISTER - openlmi-mof-register - PATHS ${CMAKE_SOURCE_DIR} - /usr/bin - NO_DEFAULT_PATH - ) add_custom_target(register-${PROVIDER_NAME} ${OPENLMI_MOF_REGISTER} -v ${OPENLMI_VERSION} register ${MOF_FILE} ${CMAKE_CURRENT_BINARY_DIR}/${REG}) add_custom_target(unregister-${PROVIDER_NAME} |