0000163: Build is broken on Fedora x86_64

View Issue Details [ Jump to Notes ]

[ Issue History ] [ Print ]

Project

Tags

No tags attached.

Attached Files

fix-linking-with-rt-on-fedora.patch [^] (1,414 bytes) 2014-11-13 16:46 [Show Content] [Hide Content]

commit de02d4ac47db4a3856e7e7cdc18890981006e5d0
Author: Ozan Çağlayan <ozancag@gmail.com>
Date:   Thu Nov 13 17:42:06 2014 +0200

    contrib: Fix linking with rt lib on Fedora

diff --git a/contrib/applications/platform/P300Stimulator/test/test_evidenceAccumulation/CMakeLists.txt b/contrib/applications/platform/P300Stimulator/test/test_evidenceAccumulation/CMakeLists.txt
index b89edb7..ea351a6 100644
--- a/contrib/applications/platform/P300Stimulator/test/test_evidenceAccumulation/CMakeLists.txt
+++ b/contrib/applications/platform/P300Stimulator/test/test_evidenceAccumulation/CMakeLists.txt
@@ -44,6 +44,7 @@ IF(UNIX)
 	ADD_DEFINITIONS(-DTARGET_OS_Linux)
 	ADD_DEFINITIONS(-DTARGET_ARCHITECTURE_i386)
 	ADD_DEFINITIONS(-DTARGET_COMPILER_GCC)
+	TARGET_LINK_LIBRARIES(${PROJECT_NAME} rt)
 ENDIF(UNIX)
 
 
diff --git a/contrib/applications/platform/P300Stimulator/test/test_sharedmemory/CMakeLists.txt b/contrib/applications/platform/P300Stimulator/test/test_sharedmemory/CMakeLists.txt
index 14539fd..976f50c 100644
--- a/contrib/applications/platform/P300Stimulator/test/test_sharedmemory/CMakeLists.txt
+++ b/contrib/applications/platform/P300Stimulator/test/test_sharedmemory/CMakeLists.txt
@@ -44,6 +44,7 @@ IF(UNIX)
 	ADD_DEFINITIONS(-DTARGET_OS_Linux)
 	ADD_DEFINITIONS(-DTARGET_ARCHITECTURE_i386)
 	ADD_DEFINITIONS(-DTARGET_COMPILER_GCC)
+	TARGET_LINK_LIBRARIES(${PROJECT_NAME} rt)
 ENDIF(UNIX)

0001-contrib-Obey-OV_COMPILE_TESTS-for-CoAdapt-stimulator.patch [^] (1,079 bytes) 2014-12-29 19:00 [Show Content] [Hide Content]

From 28c803d4299b8fe339144063edff88aa15d5dc51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ozan=20=C3=87a=C4=9Flayan?= <ozancag@gmail.com>
Date: Mon, 29 Dec 2014 19:58:31 +0200
Subject: [PATCH] contrib: Obey OV_COMPILE_TESTS for CoAdapt stimulator

---
 contrib/applications/platform/P300Stimulator/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/applications/platform/P300Stimulator/CMakeLists.txt b/contrib/applications/platform/P300Stimulator/CMakeLists.txt
index dc2c535..3003ec4 100644
--- a/contrib/applications/platform/P300Stimulator/CMakeLists.txt
+++ b/contrib/applications/platform/P300Stimulator/CMakeLists.txt
@@ -25,8 +25,8 @@ ADD_DEFINITIONS(-DBOOST_DATE_TIME_NO_LIB)
 #compile output timing to file for tests
 IF(OV_COMPILE_TESTS)
         ADD_DEFINITIONS(-DOUTPUT_TIMING)
+        ADD_SUBDIRECTORY("test")#to compile some test executables
 ENDIF(OV_COMPILE_TESTS)
-ADD_SUBDIRECTORY("test")#to compile some test executables
 # ---------------------------------
 # Target macros
 # Defines target operating system
-- 
1.9.3

Relationships

Notes
(0001166) jtlindgr (administrator) 2014-12-10 13:20	Hi Ozan, thanks for the patch! However, it seems that FindThirdPartyLibrariesForCoAdaptStimulator.cmake adds 'rt' if the needed dependencies are in general found. Perhaps a more correct solution would be to disable the test if the dependencies are not met.

(0001168) ozan.caglayan (reporter) 2014-12-29 19:00	I've attached another patch to make this module obey OV_COMPILE_TESTS CMake flag. At least I can now disable the building of the tests by setting OV_COMPILE_TESTS to false.

(0001179) nfoy (developer) 2015-02-12 10:31	Fixed by adding guards in the P300 source code

Issue History
Date Modified	Username	Field	Change
2014-11-13 16:46	ozan.caglayan	New Issue
2014-11-13 16:46	ozan.caglayan	File Added: fix-linking-with-rt-on-fedora.patch
2014-12-10 13:20	jtlindgr	Note Added: 0001166
2014-12-11 10:29	nfoy	Assigned To	=> nfoy
2014-12-11 10:29	nfoy	Status	new => assigned
2014-12-29 19:00	ozan.caglayan	File Added: 0001-contrib-Obey-OV_COMPILE_TESTS-for-CoAdapt-stimulator.patch
2014-12-29 19:00	ozan.caglayan	Note Added: 0001168
2015-02-12 10:31	nfoy	Note Added: 0001179
2015-02-12 10:31	nfoy	Status	assigned => resolved
2015-02-12 10:31	nfoy	Resolution	open => fixed