Permalink
Browse files

Move files as per recommended source layout

- Move include files under include/public
- Move nyx.pc.in file into files/pkgconfig
- Move nyx_version.h.in file in include folder.
- Move src/doc files into doc
- Remove extra CMakeLists.txt files
- WARNING: No content changes; a subsequent commit is required in order
for this component to be buildable.

Open-webOS-DCO-1.0-Signed-off-by: Sapna Todwal <sapna.todwal@palm.com>

Change-Id: Ib82bb78ebf904b99d5bc28616fb3a6817fca8546
  • Loading branch information...
1 parent fc16991 commit fb6fe68553e8e12fe00f528607bf3770d3ccc786 Sapna Todwal committed Oct 2, 2012
Showing with 0 additions and 358 deletions.
  1. 0 {src → }/doc/CMakeLists.txt
  2. 0 {src → }/doc/Doxyfile.client.in
  3. 0 {src → }/doc/Doxyfile.modules.in
  4. 0 {src → }/doc/README_FIRST.md
  5. 0 {src/config → files/pkgconfig}/nyx.pc.in
  6. 0 include/{ → public}/nyx/client/nyx_battery.h
  7. 0 include/{ → public}/nyx/client/nyx_bluetooth_input_detect.h
  8. 0 include/{ → public}/nyx/client/nyx_charger.h
  9. 0 include/{ → public}/nyx/client/nyx_device_info.h
  10. 0 include/{ → public}/nyx/client/nyx_display.h
  11. 0 include/{ → public}/nyx/client/nyx_firmware_update.h
  12. 0 include/{ → public}/nyx/client/nyx_haptics.h
  13. 0 include/{ → public}/nyx/client/nyx_keys.h
  14. 0 include/{ → public}/nyx/client/nyx_led.h
  15. 0 include/{ → public}/nyx/client/nyx_led_controller.h
  16. 0 include/{ → public}/nyx/client/nyx_led_controller_core_configuration.h
  17. 0 include/{ → public}/nyx/client/nyx_sensor_acceleration.h
  18. 0 include/{ → public}/nyx/client/nyx_sensor_als.h
  19. 0 include/{ → public}/nyx/client/nyx_sensor_angular_velocity.h
  20. 0 include/{ → public}/nyx/client/nyx_sensor_bearing.h
  21. 0 include/{ → public}/nyx/client/nyx_sensor_gravity.h
  22. 0 include/{ → public}/nyx/client/nyx_sensor_linear_acceleration.h
  23. 0 include/{ → public}/nyx/client/nyx_sensor_magnetic_field.h
  24. 0 include/{ → public}/nyx/client/nyx_sensor_orientation.h
  25. 0 include/{ → public}/nyx/client/nyx_sensor_proximity.h
  26. 0 include/{ → public}/nyx/client/nyx_sensor_rotation.h
  27. 0 include/{ → public}/nyx/client/nyx_sensor_shake.h
  28. 0 include/{ → public}/nyx/client/nyx_system.h
  29. 0 include/{ → public}/nyx/client/nyx_touchpanel.h
  30. 0 include/{ → public}/nyx/common/nyx_battery_common.h
  31. 0 include/{ → public}/nyx/common/nyx_bluetooth_input_detect_common.h
  32. 0 include/{ → public}/nyx/common/nyx_charger_common.h
  33. 0 include/{ → public}/nyx/common/nyx_core.h
  34. 0 include/{ → public}/nyx/common/nyx_device.h
  35. 0 include/{ → public}/nyx/common/nyx_device_info_common.h
  36. 0 include/{ → public}/nyx/common/nyx_display_common.h
  37. 0 include/{ → public}/nyx/common/nyx_error.h
  38. 0 include/{ → public}/nyx/common/nyx_event.h
  39. 0 include/{ → public}/nyx/common/nyx_firmware_update_common.h
  40. 0 include/{ → public}/nyx/common/nyx_haptics_common.h
  41. 0 include/{ → public}/nyx/common/nyx_keys_common.h
  42. 0 include/{ → public}/nyx/common/nyx_led_controller_common.h
  43. 0 include/{ → public}/nyx/common/nyx_led_controller_core_configuration_common.h
  44. 0 include/{ → public}/nyx/common/nyx_macros.h
  45. 0 include/{ → public}/nyx/common/nyx_sensor_acceleration_common.h
  46. 0 include/{ → public}/nyx/common/nyx_sensor_angular_velocity_common.h
  47. 0 include/{ → public}/nyx/common/nyx_sensor_bearing_common.h
  48. 0 include/{ → public}/nyx/common/nyx_sensor_gravity_common.h
  49. 0 include/{ → public}/nyx/common/nyx_sensor_linear_acceleration_common.h
  50. 0 include/{ → public}/nyx/common/nyx_sensor_magnetic_field_common.h
  51. 0 include/{ → public}/nyx/common/nyx_sensor_orientation_common.h
  52. 0 include/{ → public}/nyx/common/nyx_sensor_rotation_common.h
  53. 0 include/{ → public}/nyx/common/nyx_sensor_shake_common.h
  54. 0 include/{ → public}/nyx/common/nyx_system_common.h
  55. 0 include/{ → public}/nyx/common/nyx_touchpanel_common.h
  56. 0 {src/config → include/public/nyx/common}/nyx_version.h.in
  57. 0 include/{ → public}/nyx/module/nyx_device_device_info_internal.h
  58. 0 include/{ → public}/nyx/module/nyx_device_display_internal.h
  59. 0 include/{ → public}/nyx/module/nyx_device_haptics_internal.h
  60. 0 include/{ → public}/nyx/module/nyx_device_internal.h
  61. 0 include/{ → public}/nyx/module/nyx_event_internal.h
  62. 0 include/{ → public}/nyx/module/nyx_event_sensor_als_internal.h
  63. 0 include/{ → public}/nyx/module/nyx_event_sensor_proximity_internal.h
  64. 0 include/{ → public}/nyx/module/nyx_event_touchpanel_internal.h
  65. 0 include/{ → public}/nyx/module/nyx_log.h
  66. 0 include/{ → public}/nyx/module/nyx_module_internal.h
  67. 0 include/{ → public}/nyx/module/nyx_utils.h
  68. 0 include/{ → public}/nyx/nyx_client.h
  69. 0 include/{ → public}/nyx/nyx_module.h
  70. +0 −100 src/CMakeLists.txt
  71. +0 −23 src/core/CMakeLists.txt
  72. +0 −50 src/device/CMakeLists.txt
  73. +0 −66 src/lib.cmake
  74. +0 −41 src/nyx.cmake
  75. +0 −28 src/target/rockhopper/CMakeLists.txt
  76. +0 −29 src/target/ubuntu/CMakeLists.txt
  77. +0 −21 src/utils/CMakeLists.txt
View
0 src/doc/CMakeLists.txt → doc/CMakeLists.txt
File renamed without changes.
View
0 src/doc/Doxyfile.client.in → doc/Doxyfile.client.in
File renamed without changes.
View
0 src/doc/Doxyfile.modules.in → doc/Doxyfile.modules.in
File renamed without changes.
View
0 src/doc/README_FIRST.md → doc/README_FIRST.md
File renamed without changes.
View
0 src/config/nyx.pc.in → files/pkgconfig/nyx.pc.in
File renamed without changes.
View
0 include/nyx/client/nyx_battery.h → include/public/nyx/client/nyx_battery.h
File renamed without changes.
View
0 ...e/nyx/client/nyx_bluetooth_input_detect.h → ...c/nyx/client/nyx_bluetooth_input_detect.h
File renamed without changes.
View
0 include/nyx/client/nyx_charger.h → include/public/nyx/client/nyx_charger.h
File renamed without changes.
View
0 include/nyx/client/nyx_device_info.h → include/public/nyx/client/nyx_device_info.h
File renamed without changes.
View
0 include/nyx/client/nyx_display.h → include/public/nyx/client/nyx_display.h
File renamed without changes.
View
0 include/nyx/client/nyx_firmware_update.h → ...e/public/nyx/client/nyx_firmware_update.h
File renamed without changes.
View
0 include/nyx/client/nyx_haptics.h → include/public/nyx/client/nyx_haptics.h
File renamed without changes.
View
0 include/nyx/client/nyx_keys.h → include/public/nyx/client/nyx_keys.h
File renamed without changes.
View
0 include/nyx/client/nyx_led.h → include/public/nyx/client/nyx_led.h
File renamed without changes.
View
0 include/nyx/client/nyx_led_controller.h → ...de/public/nyx/client/nyx_led_controller.h
File renamed without changes.
View
0 ...t/nyx_led_controller_core_configuration.h → ...t/nyx_led_controller_core_configuration.h
File renamed without changes.
View
0 include/nyx/client/nyx_sensor_acceleration.h → ...blic/nyx/client/nyx_sensor_acceleration.h
File renamed without changes.
View
0 include/nyx/client/nyx_sensor_als.h → include/public/nyx/client/nyx_sensor_als.h
File renamed without changes.
View
0 .../nyx/client/nyx_sensor_angular_velocity.h → .../nyx/client/nyx_sensor_angular_velocity.h
File renamed without changes.
View
0 include/nyx/client/nyx_sensor_bearing.h → ...de/public/nyx/client/nyx_sensor_bearing.h
File renamed without changes.
View
0 include/nyx/client/nyx_sensor_gravity.h → ...de/public/nyx/client/nyx_sensor_gravity.h
File renamed without changes.
View
0 ...x/client/nyx_sensor_linear_acceleration.h → ...x/client/nyx_sensor_linear_acceleration.h
File renamed without changes.
View
0 ...de/nyx/client/nyx_sensor_magnetic_field.h → ...ic/nyx/client/nyx_sensor_magnetic_field.h
File renamed without changes.
View
0 include/nyx/client/nyx_sensor_orientation.h → ...ublic/nyx/client/nyx_sensor_orientation.h
File renamed without changes.
View
0 include/nyx/client/nyx_sensor_proximity.h → .../public/nyx/client/nyx_sensor_proximity.h
File renamed without changes.
View
0 include/nyx/client/nyx_sensor_rotation.h → ...e/public/nyx/client/nyx_sensor_rotation.h
File renamed without changes.
View
0 include/nyx/client/nyx_sensor_shake.h → include/public/nyx/client/nyx_sensor_shake.h
File renamed without changes.
View
0 include/nyx/client/nyx_system.h → include/public/nyx/client/nyx_system.h
File renamed without changes.
View
0 include/nyx/client/nyx_touchpanel.h → include/public/nyx/client/nyx_touchpanel.h
File renamed without changes.
View
0 include/nyx/common/nyx_battery_common.h → ...de/public/nyx/common/nyx_battery_common.h
File renamed without changes.
View
0 ...ommon/nyx_bluetooth_input_detect_common.h → ...ommon/nyx_bluetooth_input_detect_common.h
File renamed without changes.
View
0 include/nyx/common/nyx_charger_common.h → ...de/public/nyx/common/nyx_charger_common.h
File renamed without changes.
View
0 include/nyx/common/nyx_core.h → include/public/nyx/common/nyx_core.h
File renamed without changes.
View
0 include/nyx/common/nyx_device.h → include/public/nyx/common/nyx_device.h
File renamed without changes.
View
0 include/nyx/common/nyx_device_info_common.h → ...ublic/nyx/common/nyx_device_info_common.h
File renamed without changes.
View
0 include/nyx/common/nyx_display_common.h → ...de/public/nyx/common/nyx_display_common.h
File renamed without changes.
View
0 include/nyx/common/nyx_error.h → include/public/nyx/common/nyx_error.h
File renamed without changes.
View
0 include/nyx/common/nyx_event.h → include/public/nyx/common/nyx_event.h
File renamed without changes.
View
0 ...e/nyx/common/nyx_firmware_update_common.h → ...c/nyx/common/nyx_firmware_update_common.h
File renamed without changes.
View
0 include/nyx/common/nyx_haptics_common.h → ...de/public/nyx/common/nyx_haptics_common.h
File renamed without changes.
View
0 include/nyx/common/nyx_keys_common.h → include/public/nyx/common/nyx_keys_common.h
File renamed without changes.
View
0 ...de/nyx/common/nyx_led_controller_common.h → ...ic/nyx/common/nyx_led_controller_common.h
File renamed without changes.
View
0 ...ed_controller_core_configuration_common.h → ...ed_controller_core_configuration_common.h
File renamed without changes.
View
0 include/nyx/common/nyx_macros.h → include/public/nyx/common/nyx_macros.h
File renamed without changes.
View
0 ...x/common/nyx_sensor_acceleration_common.h → ...x/common/nyx_sensor_acceleration_common.h
File renamed without changes.
View
0 ...mmon/nyx_sensor_angular_velocity_common.h → ...mmon/nyx_sensor_angular_velocity_common.h
File renamed without changes.
View
0 ...de/nyx/common/nyx_sensor_bearing_common.h → ...ic/nyx/common/nyx_sensor_bearing_common.h
File renamed without changes.
View
0 ...de/nyx/common/nyx_sensor_gravity_common.h → ...ic/nyx/common/nyx_sensor_gravity_common.h
File renamed without changes.
View
0 ...n/nyx_sensor_linear_acceleration_common.h → ...n/nyx_sensor_linear_acceleration_common.h
File renamed without changes.
View
0 ...common/nyx_sensor_magnetic_field_common.h → ...common/nyx_sensor_magnetic_field_common.h
File renamed without changes.
View
0 ...yx/common/nyx_sensor_orientation_common.h → ...yx/common/nyx_sensor_orientation_common.h
File renamed without changes.
View
0 ...e/nyx/common/nyx_sensor_rotation_common.h → ...c/nyx/common/nyx_sensor_rotation_common.h
File renamed without changes.
View
0 include/nyx/common/nyx_sensor_shake_common.h → ...blic/nyx/common/nyx_sensor_shake_common.h
File renamed without changes.
View
0 include/nyx/common/nyx_system_common.h → ...ude/public/nyx/common/nyx_system_common.h
File renamed without changes.
View
0 include/nyx/common/nyx_touchpanel_common.h → ...public/nyx/common/nyx_touchpanel_common.h
File renamed without changes.
View
0 src/config/nyx_version.h.in → include/public/nyx/common/nyx_version.h.in
File renamed without changes.
View
0 .../module/nyx_device_device_info_internal.h → .../module/nyx_device_device_info_internal.h
File renamed without changes.
View
0 .../nyx/module/nyx_device_display_internal.h → .../nyx/module/nyx_device_display_internal.h
File renamed without changes.
View
0 .../nyx/module/nyx_device_haptics_internal.h → .../nyx/module/nyx_device_haptics_internal.h
File renamed without changes.
View
0 include/nyx/module/nyx_device_internal.h → ...e/public/nyx/module/nyx_device_internal.h
File renamed without changes.
View
0 include/nyx/module/nyx_event_internal.h → ...de/public/nyx/module/nyx_event_internal.h
File renamed without changes.
View
0 ...yx/module/nyx_event_sensor_als_internal.h → ...yx/module/nyx_event_sensor_als_internal.h
File renamed without changes.
View
0 ...ule/nyx_event_sensor_proximity_internal.h → ...ule/nyx_event_sensor_proximity_internal.h
File renamed without changes.
View
0 ...yx/module/nyx_event_touchpanel_internal.h → ...yx/module/nyx_event_touchpanel_internal.h
File renamed without changes.
View
0 include/nyx/module/nyx_log.h → include/public/nyx/module/nyx_log.h
File renamed without changes.
View
0 include/nyx/module/nyx_module_internal.h → ...e/public/nyx/module/nyx_module_internal.h
File renamed without changes.
View
0 include/nyx/module/nyx_utils.h → include/public/nyx/module/nyx_utils.h
File renamed without changes.
View
0 include/nyx/nyx_client.h → include/public/nyx/nyx_client.h
File renamed without changes.
View
0 include/nyx/nyx_module.h → include/public/nyx/nyx_module.h
File renamed without changes.
View
100 src/CMakeLists.txt
@@ -1,100 +0,0 @@
-# @@@LICENSE
-#
-# Copyright (c) 2010-2012 Hewlett-Packard Development Company, L.P.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# LICENSE@@@
-
-# Make sure the build system's version of this component matches what we're building.
-# The intent is for it to pass in COMPONENT_VERSION via the command line.
-if(DEFINED NYX_COMPONENT_VERSION)
- if (NOT (NYX_LIBRARY_VERSION STREQUAL NYX_COMPONENT_VERSION))
- message(FATAL_ERROR "Component version from build system (${NYX_COMPONENT_VERSION}) != configured version (${NYX_LIBRARY_VERSION})")
- endif()
-endif()
-
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/" ${CMAKE_MODULE_PATH})
-
-set(DEFAULT_TARGET "ubuntu" CACHE INTERNAL "The default core OS for which to build")
-
-# Should specify a core OS product (ubuntu, rockhopper, etc.)
-if(NOT TARGET)
- set(TARGET "${DEFAULT_TARGET}")
- message(WARNING "No TARGET variable specified - defaulting to ${TARGET}")
-endif()
-set(TARGET ${TARGET} CACHE string "The core OS for which to build")
-
-# Get the target-specific configuration (if any).
-include(${CMAKE_CURRENT_SOURCE_DIR}/target/${TARGET}/CMakeLists.txt OPTIONAL RESULT_VARIABLE TARGET_CONFIG)
-
-if(NOT TARGET)
- message(FATAL_ERROR "No TARGET variable specified")
-endif()
-
-if(TARGET)
- string(TOUPPER ${TARGET} TARGET_TOUPPER)
- string(REPLACE "-" "_" TARGET_TOUPPER_UNDERSCORE ${TARGET_TOUPPER})
- add_definitions(-DNYX_CORE_OS_${TARGET_TOUPPER_UNDERSCORE})
-endif()
-
-# fmessage-length=0: Make sure that errors & messages are printed on 1 line.
-macro(add_flags flags)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flags}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flags}")
-endmacro()
-
-macro(add_debug_flags flags)
- if (NOT CMAKE_BUILD_TYPE MATCHES ^Release$)
- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${flags}")
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${flags}")
- endif()
-endmacro()
-
-macro(add_release_flags flags)
- if (CMAKE_BUILD_TYPE MATCHES ^Release$)
- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} ${flags}")
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} ${flags}")
- endif()
-endmacro()
-
-macro(add_linker_flags flags)
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${flags}")
-endmacro()
-
-set(NYX_COMPONENT_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/nyx.cmake")
-
-# Can't enable Werror yet
-# add_flags("-Werror")
-add_flags("-Wall -pipe -g -std=c99")
-add_debug_flags("-O0 -DDEBUG -D_DEBUG")
-add_release_flags("-DNDEBUG")
-
-# XXX Using add_linker_flags() fails to add them to the link command line -- why??
-add_flags("-Wl,--no-undefined")
-# XXX The libraries that come with gcc fail when --no-allow-shlib-undefined is specified
-#add_flags("-Wl,--no-allow-shlib-undefined")
-
-add_definitions(-D_GNU_SOURCE=1)
-add_definitions(-DNYX_MODULE_PREFIX=\"${CMAKE_SHARED_MODULE_PREFIX}\")
-add_definitions(-DNYX_MODULE_SUFFIX=\"${CMAKE_SHARED_MODULE_SUFFIX}\")
-add_definitions(-DNYX_MODULE_DIR=\"${NYX_MODULE_DIR}\")
-add_definitions(-DNYX_MODULE_MOCK_DIR=\"${NYX_MODULE_MOCK_DIR}\")
-message("NYX_MODULE_DIR set to ${NYX_MODULE_DIR}")
-message("NYX_MODULE_MOCK_DIR set to ${NYX_MODULE_MOCK_DIR}")
-message("NYX_MODULE_PREFIX set to ${CMAKE_SHARED_MODULE_PREFIX}")
-message("NYX_MODULE_SUFFIX set to ${CMAKE_SHARED_MODULE_SUFFIX}")
-
-include(lib.cmake)
-
-add_subdirectory(doc)
View
23 src/core/CMakeLists.txt
@@ -1,23 +0,0 @@
-# @@@LICENSE
-#
-# Copyright (c) 2010-2012 Hewlett-Packard Development Company, L.P.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# LICENSE@@@
-
-include(${NYX_COMPONENT_UTILS})
-
-add_nyx_source(
- nyx_core_impl.c nyx_impl.c
-)
View
50 src/device/CMakeLists.txt
@@ -1,50 +0,0 @@
-# @@@LICENSE
-#
-# Copyright (c) 2010-2012 Hewlett-Packard Development Company, L.P.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# LICENSE@@@
-
-include(${NYX_COMPONENT_UTILS})
-
-add_nyx_source(
- nyx_battery_impl.c
- nyx_bluetooth_input_detect_impl.c
- nyx_charger_impl.c
- nyx_device_impl.c
- nyx_device_info_impl.c
- nyx_display_impl.c
- nyx_firmware_update_impl.c
- nyx_haptics_impl.c
- nyx_keys_impl.c
- nyx_led_impl.c
- nyx_led_controller_impl.c
- nyx_led_controller_core_configuration_impl.c
- nyx_system_impl.c
- nyx_touchpanel_impl.c
-)
-
-add_nyx_source(
- nyx_sensor_als_impl.c
- nyx_sensor_acceleration_impl.c
- nyx_sensor_angular_velocity_impl.c
- nyx_sensor_bearing_impl.c
- nyx_sensor_gravity_impl.c
- nyx_sensor_linear_acceleration_impl.c
- nyx_sensor_magnetic_field_impl.c
- nyx_sensor_orientation_impl.c
- nyx_sensor_proximity_impl.c
- nyx_sensor_rotation_impl.c
- nyx_sensor_shake_impl.c
-)
View
66 src/lib.cmake
@@ -1,66 +0,0 @@
-# @@@LICENSE
-#
-# Copyright (c) 2010-2012 Hewlett-Packard Development Company, L.P.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# LICENSE@@@
-
-
-include(${NYX_COMPONENT_UTILS})
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config/nyx_version.h.in ${PROJECT_SOURCE_DIR}/include/nyx/common/nyx_version.h)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config/nyx_config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/config/nyx_config.h)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config/nyx.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/config/nyx.pc @ONLY)
-
-include(FindPkgConfig)
-
-#Check that we have glib-2.0
-pkg_check_modules(GLIB2 REQUIRED glib-2.0)
-
-nyx_component(core)
-nyx_component(device)
-nyx_component(utils)
-
-if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${TARGET}")
- nyx_component(${TARGET})
-endif ()
-
-include_directories(
- ${GLIB2_INCLUDE_DIRS}
- ../include
- ${CMAKE_CURRENT_SOURCE_DIR}/config/
- ${CMAKE_CURRENT_SOURCE_DIR}/core/
- .
-)
-
-add_library(nyx
- SHARED
- ${NYX_SOURCE}
-)
-
-target_link_libraries(nyx
- ${GLIB2_LIBRARIES}
- dl
- pthread
- rt
-)
-
-
-set_target_properties(nyx PROPERTIES DEFINE_SYMBOL NYX_SHARED)
-set_target_properties(nyx PROPERTIES DEFINE_SYMBOL NYX_EXPORT)
-set_target_properties(nyx PROPERTIES VERSION ${NYX_LIBRARY_VERSION} SOVERSION ${NYX_API_VERSION_MAJOR})
-
-install(DIRECTORY ../include/ DESTINATION include/ PATTERN "*.swp" EXCLUDE)
-install(TARGETS nyx LIBRARY DESTINATION lib${LIB_SUFFIX}/)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config/nyx.pc DESTINATION lib/pkgconfig)
View
41 src/nyx.cmake
@@ -1,41 +0,0 @@
-# @@@LICENSE
-#
-# Copyright (c) 2010-2012 Hewlett-Packard Development Company, L.P.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# LICENSE@@@
-
-macro(nyx_component dir)
- set(BASE_NYX_SUBDIR ${NYX_SUBDIR})
- if (NYX_SUBDIR)
- set(NYX_SUBDIR "${NYX_SUBDIR}/${dir}")
- else()
- set(NYX_SUBDIR "${dir}")
- endif()
-
- add_subdirectory(${dir})
-
- set(NYX_SUBDIR ${BASE_NYX_SUBDIR})
-
- if (NYX_SUBDIR)
- set(NYX_SOURCE "${NYX_SOURCE}" PARENT_SCOPE)
- endif()
-endmacro()
-
-macro(add_nyx_source)
- foreach (src ${ARGV})
- list(APPEND NYX_SOURCE "${NYX_SUBDIR}/${src}")
- endforeach()
- set(NYX_SOURCE ${NYX_SOURCE} PARENT_SCOPE)
-endmacro()
View
28 src/target/rockhopper/CMakeLists.txt
@@ -1,28 +0,0 @@
-# @@@LICENSE
-#
-# Copyright (c) 2010-2012 Hewlett-Packard Development Company, L.P.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# LICENSE@@@
-
-set (CMAKE_SHARED_MODULE_PREFIX "nyx")
-set (CMAKE_SHARED_MODULE_SUFFIX ".module")
-# Use multiarch paths
-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-set (NYX_MODULE_DIR "/lib/aarch64-linux-gnu/nyx/modules")
-set (NYX_MODULE_MOCK_DIR "/lib/aarch64-linux-gnu/nyx/modules.mock")
-else()
-set (NYX_MODULE_DIR "/lib/arm-linux-gnueabi/nyx/modules")
-set (NYX_MODULE_MOCK_DIR "/lib/arm-linux-gnueabi/nyx/modules.mock")
-endif()
View
29 src/target/ubuntu/CMakeLists.txt
@@ -1,29 +0,0 @@
-# @@@LICENSE
-#
-# Copyright (c) 2010-2012 Hewlett-Packard Development Company, L.P.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# LICENSE@@@
-
-set (CMAKE_SHARED_MODULE_PREFIX "nyx")
-set (CMAKE_SHARED_MODULE_SUFFIX ".module")
-# Use multiarch paths
-# XXX Eventually convert to use output from "dpkg-architecture -qDEB_HOST_MULTIARCH"
-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-set (NYX_MODULE_DIR "/lib/x86_64-linux-gnueabi/nyx/modules")
-set (NYX_MODULE_MOCK_DIR "/lib/x86_64-linux-gnueabi-gnu/nyx/modules.mock")
-else()
-set (NYX_MODULE_DIR "/lib/i386-linux-gnueabi/nyx/modules")
-set (NYX_MODULE_MOCK_DIR "/lib/i386-linux-gnueabi/nyx/modules.mock")
-endif()
View
21 src/utils/CMakeLists.txt
@@ -1,21 +0,0 @@
-# @@@LICENSE
-#
-# Copyright (c) 2010-2012 Hewlett-Packard Development Company, L.P.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# LICENSE@@@
-
-add_nyx_source(
- nyx_async.c nyx_file_io.c nyx_log.c
-)

0 comments on commit fb6fe68

Please sign in to comment.