Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[12140] pkg/trunk
|
From: <tf...@us...> - 2009-03-05 00:00:54
|
Revision: 12140
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=12140&view=rev
Author: tfoote
Date: 2009-03-05 00:00:43 +0000 (Thu, 05 Mar 2009)
Log Message:
-----------
switching loki to be a sysdep. #1026
Modified Paths:
--------------
pkg/trunk/drivers/motor/ethercat_hardware/CMakeLists.txt
pkg/trunk/drivers/motor/ethercat_hardware/manifest.xml
pkg/trunk/mechanism/mechanism_model/CMakeLists.txt
pkg/trunk/mechanism/mechanism_model/manifest.xml
pkg/trunk/prcore/filters/CMakeLists.txt
pkg/trunk/prcore/filters/manifest.xml
Removed Paths:
-------------
pkg/trunk/3rdparty/loki/
Modified: pkg/trunk/drivers/motor/ethercat_hardware/CMakeLists.txt
===================================================================
--- pkg/trunk/drivers/motor/ethercat_hardware/CMakeLists.txt 2009-03-04 23:50:32 UTC (rev 12139)
+++ pkg/trunk/drivers/motor/ethercat_hardware/CMakeLists.txt 2009-03-05 00:00:43 UTC (rev 12140)
@@ -9,3 +9,4 @@
add_definitions(-Wall)
rospack_add_library(ethercat_hardware src/ethercat_hardware.cpp src/wg0x.cpp src/ek1122.cpp src/wg014.cpp)
rospack_add_executable(motorconf src/motorconf.cpp src/ethercat_hardware.cpp src/wg0x.cpp src/ek1122.cpp src/wg014.cpp)
+target_link_libraries(motorconf loki)
Modified: pkg/trunk/drivers/motor/ethercat_hardware/manifest.xml
===================================================================
--- pkg/trunk/drivers/motor/ethercat_hardware/manifest.xml 2009-03-04 23:50:32 UTC (rev 12139)
+++ pkg/trunk/drivers/motor/ethercat_hardware/manifest.xml 2009-03-05 00:00:43 UTC (rev 12140)
@@ -10,11 +10,11 @@
<depend package='eml'/>
<depend package='tinyxml'/>
<depend package='roscpp' />
-<depend package='loki' />
<depend package='realtime_tools' />
<depend package='robot_msgs' />
<export>
- <cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -lethercat_hardware -Wl,-rpath,${prefix}/lib"/>
+ <cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -lethercat_hardware -Wl,-rpath,${prefix}/lib -lloki"/>
</export>
<repository>http://pr.willowgarage.com/repos</repository>
+<sysdepend os="ubuntu" version="8.04-hardy" package="libloki-dev"/>
</package>
Modified: pkg/trunk/mechanism/mechanism_model/CMakeLists.txt
===================================================================
--- pkg/trunk/mechanism/mechanism_model/CMakeLists.txt 2009-03-04 23:50:32 UTC (rev 12139)
+++ pkg/trunk/mechanism/mechanism_model/CMakeLists.txt 2009-03-05 00:00:43 UTC (rev 12140)
@@ -11,10 +11,10 @@
src/wrist_transmission.cpp)
rospack_add_gtest(test/test_FK test/test_FK.cpp)
-target_link_libraries(test/test_FK mechanism_model)
+target_link_libraries(test/test_FK mechanism_model loki)
rospack_add_gtest(test/test_chain test/test_chain.cpp)
-target_link_libraries(test/test_chain mechanism_model)
+target_link_libraries(test/test_chain mechanism_model loki)
rospack_add_gtest_future(test/test_tree test/test_tree.cpp)
-target_link_libraries(test/test_tree mechanism_model)
+target_link_libraries(test/test_tree mechanism_model loki)
Modified: pkg/trunk/mechanism/mechanism_model/manifest.xml
===================================================================
--- pkg/trunk/mechanism/mechanism_model/manifest.xml 2009-03-04 23:50:32 UTC (rev 12139)
+++ pkg/trunk/mechanism/mechanism_model/manifest.xml 2009-03-05 00:00:43 UTC (rev 12140)
@@ -6,7 +6,6 @@
<review status="unreviewed" notes="API review in progress (Eric)"/>
<depend package="roscpp" />
<depend package="hardware_interface" />
-<depend package="loki" />
<depend package="tinyxml" />
<depend package="wg_robot_description_parser" />
<depend package="tf" />
@@ -15,6 +14,7 @@
<depend package="bullet" />
<url>http://pr.willowgarage.com</url>
<export>
- <cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -lmechanism_model -Wl,-rpath,${prefix}/lib"/>
+ <cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -lmechanism_model -Wl,-rpath,${prefix}/lib -lloki"/>
</export>
+<sysdepend os="ubuntu" version="8.04-hardy" package="libloki-dev"/>
</package>
Modified: pkg/trunk/prcore/filters/CMakeLists.txt
===================================================================
--- pkg/trunk/prcore/filters/CMakeLists.txt 2009-03-04 23:50:32 UTC (rev 12139)
+++ pkg/trunk/prcore/filters/CMakeLists.txt 2009-03-05 00:00:43 UTC (rev 12140)
@@ -4,14 +4,23 @@
rospack_add_boost_directories()
+
rospack_add_gtest(median_test test/test_median.cpp)
+target_link_libraries(median_test loki)
# broken, needs to go to the new form factor
rospack_add_gtest(transfer_function_test test/test_transfer_function.cpp)
+rospack_add_link_flags(transfer_function_test "-lloki")
rospack_add_gtest(mean_test test/test_mean.cpp)
+target_link_libraries(mean_test loki)
rospack_add_gtest(factory_test test/test_factory.cpp)
+target_link_libraries(factory_test loki)
+
rospack_add_gtest(chain_test test/test_chain.cpp)
+target_link_libraries(chain_test loki)
+
rospack_add_gtest(realtime_buffer_test test/test_realtime_circular_buffer.cpp)
+target_link_libraries(realtime_buffer_test loki)
\ No newline at end of file
Modified: pkg/trunk/prcore/filters/manifest.xml
===================================================================
--- pkg/trunk/prcore/filters/manifest.xml 2009-03-04 23:50:32 UTC (rev 12139)
+++ pkg/trunk/prcore/filters/manifest.xml 2009-03-05 00:00:43 UTC (rev 12140)
@@ -10,9 +10,9 @@
<review status="API conditionally cleared" notes=""/>
<url>http://pr.willowgarage.com</url>
<depend package="tinyxml"/>
-<depend package="loki" />
<depend package="rosconsole" />
<export>
-<cpp cflags="-I${prefix}/include `rosboost-cfg --cflags`"/> <!-- lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lfilter"/-->
+<cpp cflags="-I${prefix}/include `rosboost-cfg --cflags`" lflags="-lloki"/> <!--lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lfilter"/-->
</export>
+<sysdepend os="ubuntu" version="8.04-hardy" package="libloki-dev"/>
</package>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
