rsys

commit e799c9ab9d69fae89b3dd756827d1fc282de0dee
parent df7960ee84ff2205abf1d4b1a016486c96b9fb7d
Author: vaplv <vaplv@free.fr>
Date:   Tue, 24 Jun 2014 23:18:07 +0200

Remove the useless RSysConfig*.cmake files

Diffstat:
M
cmake/CMakeLists.txt
 | 
10
+++++-----
D
cmake/RSysConfig.cmake
 | 
45
---------------------------------------------
D
cmake/RSysConfigVersion.cmake
 | 
40
----------------------------------------

3 files changed, 5 insertions(+), 90 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -3,7 +3,7 @@ project(rsys C)
 cmake_policy(SET CMP0011 NEW)
 enable_testing()
 
-set(CMAKE_CURRENT_SOURCE_DIR ${PROJECT_SOURCE_DIR}/../src)
+set(RSYS_SOURCE_DIR ${PROJECT_SOURCE_DIR}/../src)
 
 ################################################################################
 # Check dependencies
@@ -66,8 +66,8 @@ set(RSYS_FILES_INC
   str.h)
 
 # Prepend each file in the `_files' list by `_path'
-rcmake_prepend_path(RSYS_FILES_SRC ${CMAKE_CURRENT_SOURCE_DIR})
-rcmake_prepend_path(RSYS_FILES_INC ${CMAKE_CURRENT_SOURCE_DIR})
+rcmake_prepend_path(RSYS_FILES_SRC ${RSYS_SOURCE_DIR})
+rcmake_prepend_path(RSYS_FILES_INC ${RSYS_SOURCE_DIR})
 
 add_library(rsys SHARED ${RSYS_FILES_SRC} ${RSYS_FILES_INC})
 target_link_libraries(rsys ${CMAKE_THREAD_LIBS_INIT})
@@ -86,7 +86,7 @@ endif(NOT MINGW)
 # Add tests
 ################################################################################
 macro(new_test _name)
-  add_executable(${_name} ${CMAKE_CURRENT_SOURCE_DIR}/${_name}.c)
+  add_executable(${_name} ${RSYS_SOURCE_DIR}/${_name}.c)
   set(_libraries  ${ARGN})
   foreach(_lib ${_libraries})
     target_link_libraries(${_name} ${_lib})
@@ -114,7 +114,7 @@ new_test(test_signal rsys)
 new_test(test_str rsys)
 new_test(test_time rsys)
 
-add_library(test_lib SHARED ${CMAKE_CURRENT_SOURCE_DIR}/test_library.c)
+add_library(test_lib SHARED ${RSYS_SOURCE_DIR}/test_library.c)
 set_target_properties(test_lib PROPERTIES
   COMPILE_DEFINITIONS TEST_LIBRARY_BUILD_LIB
   DEBUG_POSTFIX "")
diff --git a/cmake/RSysConfig.cmake b/cmake/RSysConfig.cmake
@@ -1,45 +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 include directory
-#   - RSys: Link this 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 AND RSys_LIBRARY_DEBUG)
-  unset(RSys_LIBRARY CACHE)
-  set(RSys_LIBRARY ${RSys_LIBRARY_DEBUG}
-    CACHE PATH "Path to a library")
-endif(NOT RSys_LIBRARY)
-
-if(NOT RSys_LIBRARY_DEBUG AND RSys_LIBRARY)
-  unset(RSys_LIBRARY_DEBUG CACHE)
-  set(RSys_LIBRARY_DEBUG ${RSys_LIBRARY}
-    CACHE PATH "Path to a library")
-endif(NOT RSys_LIBRARY_DEBUG)
-
-if(CMAKE_HOST_WIN32)
-  set(_property IMPORTED_IMPLIB)
-else(CMAKE_HOST_WIN32)
-  set(_property IMPORTED_LOCATION)
-endif(CMAKE_HOST_WIN32)
-
-add_library(RSys  IMPORTED)
-set_target_properties(RSys PROPERTIES
-  ${_property} ${RSys_LIBRARY_DEBUG}
-  ${_property}_DEBUG ${RSys_LIBRARY_DEBUG}
-  ${_property}_RELEASE ${RSys_LIBRARY})
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(RSys DEFAULT_MSG
-  RSys_INCLUDE_DIR
-  RSys_LIBRARY
-  RSys_LIBRARY_DEBUG)
-
diff --git a/cmake/RSysConfigVersion.cmake b/cmake/RSysConfigVersion.cmake
@@ -1,40 +0,0 @@
-set(VERSION_MAJOR 0)
-set(VERSION_MINOR 0)
-set(VERSION_PATCH 0)
-set(PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
-
-if(NOT PACKAGE_FIND_VERSION
-   OR PACKAGE_VERSION VERSION_EQUAL PACKAGE_FIND_VERSION)
-  set(PACKAGE_VERSION_COMPATIBLE TRUE)
-  set(PACKAGE_VERSION_EXACT TRUE)
-  set(PACKAGE_VERSION_UNSUITABLE FALSE)
-  return()
-endif(NOT PACKAGE_FIND_VERSION
-      OR PACKAGE_VERSION VERSION_EQUAL PACKAGE_FIND_VERSION)
-
-if(NOT VERSION_MAJOR VERSION_EQUAL PACKAGE_FIND_VERSION_MAJOR)
-  set(PACKAGE_VERSION_COMPATIBLE FALSE)
-  set(PACKAGE_VERSION_EXACT FALSE)
-  set(PACKAGE_VERSION_UNSUITABLE TRUE)
-  return()
-endif(NOT VERSION_MAJOR VERSION_EQUAL PACKAGE_FIND_VERSION_MAJOR)
-
-if(VERSION_MINOR VERSION_LESS PACKAGE_FIND_VERSION_MINOR)
-  set(PACKAGE_VERSION_COMPATIBLE FALSE)
-  set(PACKAGE_VERSION_EXACT FALSE)
-  set(PACKAGE_VERSION_UNSUITABLE TRUE)
-  return()
-endif(VERSION_MINOR VERSION_LESS PACKAGE_FIND_VERSION_MINOR)
-
-if(VERSION_MINOR VERSION_EQUAL PACKAGE_FIND_VERSION_MINOR )
-  if(VERSION_PATCH VERSION_LESS PACKAGE_FIND_VERSION_PATCH)
-    set(PACKAGE_VERSION_COMPATIBLE FALSE)
-    set(PACKAGE_VERSION_EXACT FALSE)
-    set(PACKAGE_VERSION_UNSUITABLE TRUE)
-    return()
-  endif()
-endif()
-
-set(PACKAGE_VERSION_COMPATIBLE TRUE)
-set(PACKAGE_VERSION_EXACT FALSE)
-set(PACKAGE_VERSION_UNSUITABLE FALSE)