summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorRadek Novacek <rnovacek@redhat.com>2012-07-25 15:10:40 +0200
committerRadek Novacek <rnovacek@redhat.com>2012-07-25 15:10:40 +0200
commitd9d3ba6e636c9d0253d863f7121c94177b5b1265 (patch)
tree4583954e59d0c02dee8e0cf2e1fd8ab20c87c43f /cmake
parentbd39145bf09b445c6015969160a16f39fb2519ee (diff)
downloadopenlmi-providers-d9d3ba6e636c9d0253d863f7121c94177b5b1265.tar.gz
openlmi-providers-d9d3ba6e636c9d0253d863f7121c94177b5b1265.tar.xz
openlmi-providers-d9d3ba6e636c9d0253d863f7121c94177b5b1265.zip
Fix few errors in CuraMacros.cmake and power cmake
Diffstat (limited to 'cmake')
-rw-r--r--cmake/modules/CuraMacros.cmake22
1 files changed, 12 insertions, 10 deletions
diff --git a/cmake/modules/CuraMacros.cmake b/cmake/modules/CuraMacros.cmake
index ffd9d32..0b750f7 100644
--- a/cmake/modules/CuraMacros.cmake
+++ b/cmake/modules/CuraMacros.cmake
@@ -8,13 +8,11 @@
#
macro(konkretcmpi_generate MOF CIM_PROVIDERS CIM_HEADERS)
# Check if MOF exists
- find_file(MOF_FILE
- ${MOF}
- PATHS ${CMAKE_SOURCE_DIR}/mof/
- )
- if (MOF_FILE STREQUAL "MOF_FILE-NOTFOUND")
+ set(MOF_FILE ${CMAKE_SOURCE_DIR}/mof/${MOF})
+ message(STATUS "Using mof ${MOF} ${MOF_FILE}")
+ if (NOT EXISTS ${MOF_FILE})
message(FATAL_ERROR "MOF file ${MOF} not found")
- endif (MOF_FILE STREQUAL "MOF_FILE-NOTFOUND")
+ endif (NOT EXISTS ${MOF_FILE})
# Read CIM classes out of MOF file
execute_process(COMMAND sed -e "/class/ !D" -e "s/class \\(.*\\):.*/\\1/g"
@@ -30,13 +28,13 @@ macro(konkretcmpi_generate MOF CIM_PROVIDERS CIM_HEADERS)
string(REGEX MATCHALL "[a-zA-Z_-]+" CIM_CLASSES ${CIM_CLASSES})
# Get headers and sources names from the list of CIM classes
- set(${CIM_HEADERS} "")
- set(${CIM_PROVIDERS} "")
+ set(HEADERS "")
+ set(PROVIDERS "")
set(GENERATE_PROVIDERS "")
set(NEW_PROVIDERS "")
foreach(CLASS ${CIM_CLASSES})
# Add generated header to the list
- set(${CIM_HEADERS} ${CIM_HEADERS} ${CLASS}.h)
+ set(HEADERS ${HEADERS} ${CLASS}.h)
# Get name of the source file
set(PROVIDER ${CLASS}Provider.c)
# If the provider doesn't exist, generate it
@@ -47,7 +45,7 @@ macro(konkretcmpi_generate MOF CIM_PROVIDERS CIM_HEADERS)
set(NEW_PROVIDERS ${NEW_PROVIDERS} ${PROVIDER})
endif (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${PROVIDER})
# Add provider source to the list
- set(${CIM_PROVIDERS} ${CIM_PROVIDERS} ${PROVIDER})
+ set(PROVIDERS ${PROVIDERS} ${PROVIDER})
endforeach(CLASS ${CIM_CLASSES})
# Generate headers for CIM classes
@@ -72,6 +70,10 @@ macro(konkretcmpi_generate MOF CIM_PROVIDERS CIM_HEADERS)
foreach(PROVIDER ${NEW_PROVIDERS})
file(RENAME ${CMAKE_CURRENT_BINARY_DIR}/${PROVIDER} ${CMAKE_CURRENT_SOURCE_DIR}/${PROVIDER})
endforeach(PROVIDER ${NEW_PROVIDERS})
+
+ # Return to caller
+ set(${CIM_HEADERS} ${HEADERS})
+ set(${CIM_PROVIDERS} ${PROVIDERS})
endmacro(konkretcmpi_generate MOF PROVIDERS HEADERS)
# This macro creates registration file from shared library