diff options
| author | Radek Novacek <rnovacek@redhat.com> | 2012-08-29 13:53:35 +0200 |
|---|---|---|
| committer | Radek Novacek <rnovacek@redhat.com> | 2012-08-29 13:58:39 +0200 |
| commit | f9d8c237252e04c0f978b35291651d4f5fb392bb (patch) | |
| tree | aa77f25639ec9463f129a400f2a7bbfb533166f9 | |
| parent | 7757c0018d8dbaeec3194958b3029d69120ac465 (diff) | |
| download | openlmi-providers-0.0.3.tar.gz openlmi-providers-0.0.3.tar.xz openlmi-providers-0.0.3.zip | |
Make destination of .reg adjustable in CuraMacros0.0.3
If CuraMacros are used by different provider it needs to change location
where the .reg is installed.
| -rw-r--r-- | cmake/modules/CuraMacros.cmake | 5 | ||||
| -rw-r--r-- | src/account/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/fan/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/power/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/service/CMakeLists.txt | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/cmake/modules/CuraMacros.cmake b/cmake/modules/CuraMacros.cmake index 7d83d42..1821c7c 100644 --- a/cmake/modules/CuraMacros.cmake +++ b/cmake/modules/CuraMacros.cmake @@ -82,8 +82,9 @@ endmacro(konkretcmpi_generate MOF PROVIDERS HEADERS) # @param[in] PROVIDER_NAME human-readable name of the provider # @param[in] LIBRARY_NAME name of the library without lib prefix and .so suffix (same as for add_library) # @param[in] MOF name of the MOF file +# @param[in] DEST destination directory where to install .reg file # -macro(cim_registration PROVIDER_NAME LIBRARY_NAME MOF) +macro(cim_registration PROVIDER_NAME LIBRARY_NAME MOF DEST) # Create registration out of shared library add_custom_command(TARGET ${LIBRARY_NAME} POST_BUILD @@ -92,7 +93,7 @@ macro(cim_registration PROVIDER_NAME LIBRARY_NAME MOF) WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) # Install it - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/LMI_${PROVIDER_NAME}.reg DESTINATION share/cura-providers/) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/LMI_${PROVIDER_NAME}.reg DESTINATION ${DEST}) # Add custom target for registration find_file(MOF_FILE diff --git a/src/account/CMakeLists.txt b/src/account/CMakeLists.txt index 8d69a93..ecb0945 100644 --- a/src/account/CMakeLists.txt +++ b/src/account/CMakeLists.txt @@ -32,7 +32,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMPI_INCLUDE_DIR} ${LIBUSER_IN target_link_libraries(${LIBRARY_NAME} curacommon ${KONKRETCMPI_LIBRARIES} ${LIBUSER_LIBRARIES}) # Create registration file -cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF}) +cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/cura-providers) install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi/) diff --git a/src/fan/CMakeLists.txt b/src/fan/CMakeLists.txt index 6e9ab97..16c6e18 100644 --- a/src/fan/CMakeLists.txt +++ b/src/fan/CMakeLists.txt @@ -24,7 +24,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMPI_INCLUDE_DIR}) target_link_libraries(${LIBRARY_NAME} curacommon ${KONKRETCMPI_LIBRARIES} sensors) # Create registration file -cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF}) +cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/cura-providers) install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi/) diff --git a/src/power/CMakeLists.txt b/src/power/CMakeLists.txt index a577af9..7b1ddc0 100644 --- a/src/power/CMakeLists.txt +++ b/src/power/CMakeLists.txt @@ -40,7 +40,7 @@ if (${SYSTEMCTL_FOUND}) endif (${SYSTEMCTL_FOUND}) # Create registration file -cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF}) +cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/cura-providers) install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi/) diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt index 2997213..46c3e71 100644 --- a/src/service/CMakeLists.txt +++ b/src/service/CMakeLists.txt @@ -22,7 +22,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMPI_INCLUDE_DIR}) target_link_libraries(${LIBRARY_NAME} curacommon ${KONKRETCMPI_LIBRARIES}) # Create registration file -cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF}) +cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/cura-providers) install(PROGRAMS util/servicedisc.sh util/serviceutil.sh DESTINATION libexec) |