diff options
| author | Radek Novacek <rnovacek@redhat.com> | 2013-10-23 15:48:25 +0200 |
|---|---|---|
| committer | Radek Novacek <rnovacek@redhat.com> | 2013-10-23 16:02:13 +0200 |
| commit | fe9ffdf9ab8be28357c256a3f1052832304b241b (patch) | |
| tree | fd2bb4f4a9a77800badde5c59e468352a97605de | |
| parent | c365bd126b1d60a32a51e50d9cdadca11c4eb5fb (diff) | |
| download | openlmi-providers-fe9ffdf9ab8be28357c256a3f1052832304b241b.tar.gz openlmi-providers-fe9ffdf9ab8be28357c256a3f1052832304b241b.tar.xz openlmi-providers-fe9ffdf9ab8be28357c256a3f1052832304b241b.zip | |
cmake: don't use hardcoded paths
Path to the qualifiers and jobs mofs was hardcoded, now it's a variable.
There is now also a variable for openlmi-mof-register script - this
fixes (un)register-Provider targets.
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | doc/admin/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/power/CMakeLists.txt | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 812c3a6..04b7aeb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,6 +39,11 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_P include(OpenLMIMacros) +# Set some file paths +set(OPENLMI_QUALIFIERS_MOF "${CMAKE_SOURCE_DIR}/mof/05_LMI_Qualifiers.mof") +set(OPENLMI_JOBS_MOF "${CMAKE_SOURCE_DIR}/mof/30_LMI_Jobs.mof") +set(OPENLMI_MOF_REGISTER "${CMAKE_SOURCE_DIR}/openlmi-mof-register") + find_package(PkgConfig) # Find required packages diff --git a/doc/admin/CMakeLists.txt b/doc/admin/CMakeLists.txt index 74076cb..095a8f3 100644 --- a/doc/admin/CMakeLists.txt +++ b/doc/admin/CMakeLists.txt @@ -87,8 +87,8 @@ foreach(I RANGE ${LEN}) COMMAND $(CMAKE_SOURCE_DIR)/tools/openlmi-doc-class2rst -H ${CMAKE_CURRENT_SOURCE_DIR}/header.txt --schema /usr/share/mof/cim-current/CIM_Schema.mof - --schema ${CMAKE_SOURCE_DIR}/mof/05_LMI_Qualifiers.mof - --schema ${CMAKE_SOURCE_DIR}/mof/30_LMI_Jobs.mof + --schema ${OPENLMI_QUALIFIERS_MOF} + --schema ${OPENLMI_JOBS_MOF} --mof ${CMAKE_SOURCE_DIR}/mof/${MOF} CIM_ComputerSystem WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${PROVIDER}/mof diff --git a/src/power/CMakeLists.txt b/src/power/CMakeLists.txt index ea4921a..42e001f 100644 --- a/src/power/CMakeLists.txt +++ b/src/power/CMakeLists.txt @@ -12,7 +12,7 @@ konkretcmpi_generate(${MOF} CIM_PROVIDERS CIM_HEADERS CIM_CLASSES - 05_LMI_Qualifiers.mof + ${OPENLMI_QUALIFIERS_MOF} ) add_library(${LIBRARY_NAME} SHARED |