diff options
| author | Michal Minar <miminar@redhat.com> | 2014-03-25 12:19:58 +0100 |
|---|---|---|
| committer | Michal Minar <miminar@redhat.com> | 2014-04-23 15:26:51 +0200 |
| commit | 799820bf4b9208f76b290213f501f2cf2a9735dc (patch) | |
| tree | 5b7557c29c763f454d180181d3abc8840fbfe807 | |
| parent | a9b3e7f90b4d2e3f1e2de158bdd861c859e0c825 (diff) | |
| download | openlmi-providers-799820bf4b9208f76b290213f501f2cf2a9735dc.tar.gz openlmi-providers-799820bf4b9208f76b290213f501f2cf2a9735dc.tar.xz openlmi-providers-799820bf4b9208f76b290213f501f2cf2a9735dc.zip | |
moved openlmicommon library to common/ subfolder
| -rw-r--r-- | src/CMakeLists.txt | 26 | ||||
| -rw-r--r-- | src/common/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | src/common/openlmi.c (renamed from src/openlmi.c) | 0 | ||||
| -rw-r--r-- | src/common/openlmi.conf (renamed from src/openlmi.conf) | 0 | ||||
| -rw-r--r-- | src/common/openlmi.h (renamed from src/openlmi.h) | 0 | ||||
| -rw-r--r-- | src/common/openlmi.pc.in (renamed from src/openlmi.pc.in) | 0 |
6 files changed, 26 insertions, 20 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index abca02d..888b59a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,24 +1,10 @@ -include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMPI_INCLUDE_DIR} ${GLIB_INCLUDE_DIRS}) +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + common + ${CMPI_INCLUDE_DIR} + ${GLIB_INCLUDE_DIRS}) -add_library(openlmicommon SHARED - openlmi.c -) - -target_link_libraries(openlmicommon ${GLIB_LIBRARIES} dl) - -set(OPENLMICOMMON_VERSION_MAJOR 0) -set(OPENLMICOMMON_VERSION_MINOR 0) -set(OPENLMICOMMON_VERSION_PATCH 1) -set(OPENLMICOMMON_VERSION "${OPENLMICOMMON_VERSION_MAJOR}.${OPENLMICOMMON_VERSION_MINOR}.${OPENLMICOMMON_VERSION_PATCH}") - -set_target_properties(openlmicommon PROPERTIES VERSION ${OPENLMICOMMON_VERSION}) -set_target_properties(openlmicommon PROPERTIES SOVERSION ${OPENLMICOMMON_VERSION_MAJOR}) - -install(TARGETS openlmicommon DESTINATION lib${LIB_SUFFIX}) -install(FILES openlmi.h DESTINATION include/openlmi) -configure_file(openlmi.pc.in ${CMAKE_CURRENT_BINARY_DIR}/openlmi.pc @ONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/openlmi.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) -install(FILES openlmi.conf DESTINATION ${SYSCONF_INSTALL_DIR}/openlmi) +add_subdirectory(common) if (WITH-FAN) add_subdirectory(fan) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt new file mode 100644 index 0000000..129719f --- /dev/null +++ b/src/common/CMakeLists.txt @@ -0,0 +1,20 @@ +set(OPENLMICOMMON_VERSION_MAJOR 0) +set(OPENLMICOMMON_VERSION_MINOR 0) +set(OPENLMICOMMON_VERSION_PATCH 1) +set(OPENLMICOMMON_VERSION "${OPENLMICOMMON_VERSION_MAJOR}.${OPENLMICOMMON_VERSION_MINOR}.${OPENLMICOMMON_VERSION_PATCH}") + +configure_file(openlmi.pc.in ${CMAKE_CURRENT_BINARY_DIR}/openlmi.pc @ONLY) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/openlmi.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) +install(FILES openlmi.conf DESTINATION ${SYSCONF_INSTALL_DIR}/openlmi) + +add_library(openlmicommon SHARED + openlmi.c +) + +target_link_libraries(openlmicommon ${GLIB_LIBRARIES} dl) + +set_target_properties(openlmicommon PROPERTIES VERSION ${OPENLMICOMMON_VERSION}) +set_target_properties(openlmicommon PROPERTIES SOVERSION ${OPENLMICOMMON_VERSION_MAJOR}) + +install(TARGETS openlmicommon DESTINATION lib${LIB_SUFFIX}) +install(FILES openlmi.h DESTINATION include/openlmi) diff --git a/src/openlmi.c b/src/common/openlmi.c index 2391062..2391062 100644 --- a/src/openlmi.c +++ b/src/common/openlmi.c diff --git a/src/openlmi.conf b/src/common/openlmi.conf index 64684a8..64684a8 100644 --- a/src/openlmi.conf +++ b/src/common/openlmi.conf diff --git a/src/openlmi.h b/src/common/openlmi.h index a46544c..a46544c 100644 --- a/src/openlmi.h +++ b/src/common/openlmi.h diff --git a/src/openlmi.pc.in b/src/common/openlmi.pc.in index 939d672..939d672 100644 --- a/src/openlmi.pc.in +++ b/src/common/openlmi.pc.in |