Attachment 951154 Details for Bug 1156648 – Cmake fixes

[patch] Cmake fixes

iguanaIR-cmake-fixes.patch (text/plain), 4.06 KB, created by Richard Shaw on 2014-10-27 20:08:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Richard Shaw

Created: 2014-10-27 20:08:27 UTC

Size: 4.06 KB

patch

obsolete

>diff -Naur iguanaIR-1.1.0.orig/CMakeLists.txt iguanaIR-1.1.0/CMakeLists.txt
>--- iguanaIR-1.1.0.orig/CMakeLists.txt	2013-07-28 12:08:08.000000000 -0500
>+++ iguanaIR-1.1.0/CMakeLists.txt	2014-10-27 15:01:43.062259635 -0500
>@@ -1,6 +1,9 @@
> cmake_minimum_required(VERSION 2.6)
> project(IguanaIR C)
> 
>+Set(SOVERSION 0)
>+Set(FULLVER 0.3)
>+
> #Set(TARGET_ANDROID true)
> 
> If(TARGET_ANDROID)
>@@ -39,11 +42,15 @@
> 
> EndIf()
> 
>-include(CheckFunctionExists)
>+# Let's use CheckLibraryExists instead
>+#include(CheckFunctionExists)
>+include(CheckLibraryExists)
> 
> # default the LIBDIR if it was not set
> If("${LIBDIR}" STREQUAL "")
>-  Set(LIBDIR "/usr/lib")
>+  # This should be a relative path, the prefix should be set using
>+  # CMAKE_INSTALL_PREFIX, default on *nix is /usr/local.
>+  Set(LIBDIR lib)
> EndIf()
> 
> # set a couple variables early
>@@ -71,9 +78,10 @@
>     Set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O2 -Wall -pedantic")
> 
>     # see if we have clock_gettime in time.h
>-    Set(CMAKE_REQUIRED_LIBRARIES rt)
>-    check_function_exists(clock_gettime USE_CLOCK_GETTIME)
>-    Unset(CMAKE_REQUIRED_LIBRARIES)
>+    #Set(CMAKE_REQUIRED_LIBRARIES rt)
>+    #check_function_exists(clock_gettime USE_CLOCK_GETTIME)
>+    #Unset(CMAKE_REQUIRED_LIBRARIES)
>+    check_library_exists(rt clock_gettime "" USE_CLOCK_GETTIME)
> 
>     # default all symbols to hidden under gcc
> # TODO: if we set the visibility correctly then the drivers cannot
>@@ -97,8 +105,10 @@
> add_library(iguanaIR SHARED
>                      iguanaIR.c dataPackets.c ${PIPESRC}
>                      ${BASESRC})
>-set_property(TARGET iguanaIR
>-             APPEND PROPERTY COMPILE_DEFINITIONS IGUANAIR_EXPORTS)
>+set_target_properties(iguanaIR PROPERTIES
>+    COMPILE_DEFINITIONS IGUANAIR_EXPORTS
>+    VERSION ${FULLVER}
>+    SOVERISON ${SOVERSION})
> install(TARGETS iguanaIR
>         DESTINATION ${LIBDIR})
> 
>@@ -110,11 +120,11 @@
> add_executable(igdaemon ${DAEMONSRC}
>                server.c client-interface.c device-interface.c driver.c
>                list.c protocol-versions.c ${PIPESRC} dataPackets.c ${BASESRC})
>-set_property(TARGET igdaemon
>-             APPEND PROPERTY COMPILE_DEFINITIONS SUPPORT_EXPORTS)
>+set_target_properties(igdaemon PROPERTIES
>+             COMPILE_DEFINITIONS SUPPORT_EXPORTS)
> target_link_libraries(igdaemon iguanaIR
>                                ${DAEMONLIBS} ${BASELIBS} ${ARGPLIB})
>-install(TARGETS igdaemon DESTINATION /usr/bin)
>+install(TARGETS igdaemon DESTINATION bin)
> 
> 
> # build all the drivers
>@@ -122,10 +132,10 @@
> 
> # build igclient to test our API
> add_executable(igclient client.c list.c ${BASESRC})
>-set_property(TARGET igclient
>-             APPEND PROPERTY COMPILE_DEFINITIONS SUPPORT_EXPORTS)
>+set_target_properties(igclient PROPERTIES
>+             COMPILE_DEFINITIONS SUPPORT_EXPORTS)
> target_link_libraries(igclient iguanaIR ${BASELIBS} ${ARGPLIB})
>-install(TARGETS igclient DESTINATION /usr/bin)
>+install(TARGETS igclient DESTINATION bin)
> 
> 
> # see if we have python and swig
>@@ -149,8 +159,9 @@
>     EndIf()
> 
>     # install the python support
>-    install(FILES ${CMAKE_BINARY_DIR}/_iguanaIR.so
>-                  ${CMAKE_BINARY_DIR}/iguanaIR.py
>+    install(TARGETS ${SWIG_MODULE_iguanaIR_REAL_NAME}
>+            DESTINATION ${LIBDIR}/python2.7/site-packages)
>+    install(FILES ${CMAKE_BINARY_DIR}/iguanaIR.py
>             DESTINATION ${LIBDIR}/python2.7/site-packages)
> 
>     # install the reflasher script and hex files
>@@ -160,7 +171,7 @@
>             PATTERN "body-0.hex" EXCLUDE
>             PATTERN "loader-0.hex" EXCLUDE)
>     install(PROGRAMS files/python/usr/share/iguanaIR-reflasher/iguanaIR-reflasher
>-            DESTINATION /usr/share/iguanaIR-reflasher)
>+            DESTINATION share/iguanaIR-reflasher)
> 
>     # force creation of a symlink
>     install(CODE "
>@@ -183,9 +194,9 @@
> install(PROGRAMS files/base/etc/init.d/iguanaIR
>         DESTINATION /etc/init.d)
> install(PROGRAMS files/base/usr/bin/iguanaIR-rescan
>-        DESTINATION /usr/bin)
>+        DESTINATION bin)
> install(FILES iguanaIR.h
>-        DESTINATION /usr/include)
>+        DESTINATION include)
> 
> ##########################################
> #install: all

Actions: View | Diff

Attachments on bug 1156648: 951154