rsys

commit 0396aa42e744eab1e99da14554cc74d96659de2e
parent d370fc6201427d77c3e169ca2c3b87e7dc6beb6b
Author: vaplv <vaplv@free.fr>
Date:   Sun, 22 Jun 2014 22:00:11 +0200

Take into account the RCMake refactoring

Diffstat:
M
.gitignore
 | 
3
---
M
cmake/CMakeLists.txt
 | 
48
++++++++++++------------------------------------
D
cmake/RsysConfig.cmake
 | 
26
--------------------------
D
src/rsys_version.h.in
 | 
9
---------

4 files changed, 12 insertions(+), 74 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,3 @@ tmp
 *.[ao]
 *~
 tags
-rsys_version.h
-RSysConfig.cmake
-RSysConfigVersion.cmake
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -20,44 +20,23 @@ set(CMAKE_MODULE_PATH ${RCMAKE_SOURCE_DIR})
 include(rcmake)
 
 ################################################################################
-# Generate the module configuration file
-################################################################################
-set(RCMAKE_MODULE_PREFIX RSys)
-set(RCMAKE_MODULE_HEADER rsys/rsys.h)
-set(RCMAKE_MODULE_LIBRARY rsys)
-configure_file(${RCMAKE_SOURCE_DIR}/config.cmake.in
-  ${PROJECT_SOURCE_DIR}/RSysConfig.cmake @ONLY)
-
-set(RCMAKE_MODULE_VERSION_MAJOR 0)
-set(RCMAKE_MODULE_VERSION_MINOR 0)
-set(RCMAKE_MODULE_VERSION_PATCH 0)
-configure_file(${RCMAKE_SOURCE_DIR}/config_version.cmake.in
-  ${PROJECT_SOURCE_DIR}/RSysConfigVersion.cmake @ONLY)
-
-################################################################################
 # Configure and define targets
 ################################################################################
-set(VERSION_MAJOR ${RCMAKE_MODULE_VERSION_MAJOR})
-set(VERSION_MINOR ${RCMAKE_MODULE_VERSION_MINOR})
-set(VERSION_PATCH ${RCMAKE_MODULE_VERSION_PATCH})
-set(RSYS_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
-message(STATUS "Current ${PROJECT_NAME} version: ${RSYS_VERSION}")
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/rsys_version.h.in
-  ${CMAKE_CURRENT_SOURCE_DIR}/rsys_version.h @ONLY)
-
-set(RSYS_FILES_CMAKE
-  RSysConfig.cmake
-  RSysConfigVersion.cmake)
+set(VERSION_MAJOR 0)
+set(VERSION_MINOR 0)
+set(VERSION_PATCH 0)
+set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
+
 set(RSYS_FILES_SRC
   clock_time.c
+  float44.c
   image.c
   library.c
   mem_allocator.c
   pthread/pthread_condition.c
   pthread/pthread_mutex.c
   str.c)
-set(RSYS_FILES_INC_COMMON
+set(RSYS_FILES_INC
   binary_heap.h
   clock_time.h
   dynamic_array.h
@@ -77,22 +56,20 @@ set(RSYS_FILES_INC_COMMON
   rsys.h
   signal.h
   str.h)
-set(RSYS_FILES_INC_EDIT ${RSYS_FILES_INC_COMMON} rsys_version.h.in)
-set(RSYS_FILES_INC_INSTALL ${RSYS_FILES_INC_COMMON} rsys_version.h)
 
 # Prepend each file in the `_files' list by `_path'
-rcmake_prepend_path(RSYS_FILES_CMAKE ${PROJECT_SOURCE_DIR})
 rcmake_prepend_path(RSYS_FILES_SRC ${CMAKE_CURRENT_SOURCE_DIR})
-rcmake_prepend_path(RSYS_FILES_INC_EDIT ${CMAKE_CURRENT_SOURCE_DIR})
-rcmake_prepend_path(RSYS_FILES_INC_INSTALL ${CMAKE_CURRENT_SOURCE_DIR})
+rcmake_prepend_path(RSYS_FILES_INC ${CMAKE_CURRENT_SOURCE_DIR})
 
 add_library(rsys SHARED ${RSYS_FILES_SRC} ${RSYS_FILES_INC})
 target_link_libraries(rsys ${CMAKE_THREAD_LIBS_INIT})
 set_target_properties(rsys PROPERTIES
   DEFINE_SYMBOL RSYS_SHARED_BUILD
-  VERSION ${RSYS_VERSION}
+  VERSION ${VERSION}
   SOVERSION ${VERSION_MAJOR})
 
+rcmake_setup_devel(RSys rsys ${VERSION} rsys/rsys_version.h)
+
 if(NOT MINGW)
   target_link_libraries(rsys dl)
 endif(NOT MINGW)
@@ -145,6 +122,5 @@ install(TARGETS rsys
   ARCHIVE DESTINATION bin
   LIBRARY DESTINATION lib
   RUNTIME DESTINATION bin)
-install(FILES ${RSYS_FILES_INC_INSTALL} DESTINATION include/rsys)
-install(FILES ${RSYS_FILES_CMAKE} DESTINATION cmake)
+install(FILES ${RSYS_FILES_INC} DESTINATION include/rsys)
 
diff --git a/cmake/RsysConfig.cmake b/cmake/RsysConfig.cmake
@@ -1,26 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-# Try to find the RSys devel. Once done this will define:
-# 	- RSys_FOUND: system has RSys
-# 	- RSys_INCLUDE_DIR: the RSys include directory
-# 	- RSys_LIBRARY[_DEBUG]: Link these to use rsys
-find_path(RSys_INCLUDE_DIR rsys/rsys.h)
-
-find_library(RSys_LIBRARY 
-  rsys 
-  PATHS bin Bin BIN)
-
-find_library(RSys_LIBRARY_DEBUG 
-  rsys-dbg 
-  PATHS bin Bin BIN)
-
-if(NOT RSys_LIBRARY_DEBUG)
-  unset(RSys_LIBRARY_DEBUG CACHE) 
-  set(RSys_LIBRARY_DEBUG  
-    CACHE PATH "Path to a library")
-endif(NOT RSys_LIBRARY_DEBUG)
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(RSys DEFAULT_MSG
-  RSys_INCLUDE_DIR
-  RSys_LIBRARY
-  RSys_LIBRARY_DEBUG)
diff --git a/src/rsys_version.h.in b/src/rsys_version.h.in
@@ -1,9 +0,0 @@
-#ifndef RSYS_VERSION_H
-#define RSYS_VERSION_H
-
-#define RSYS_VERSION_MAJOR @VERSION_MAJOR@
-#define RSYS_VERSION_MINOR @VERSION_MINOR@
-#define RSYS_VERSION_PATCH @VERSION_PATCH@
-
-#endif  /* RSYS_VERSION_H */
-