Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
robotpkg-wip
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Gepetto
robotpkg-wip
Commits
1f238d7a
Commit
1f238d7a
authored
9 years ago
by
Raphaël Lallement
Browse files
Options
Downloads
Patches
Plain Diff
[wp/hatptester] Bump to version 1.5.2
Fix many comilation issues
parent
5c9da0cc
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
hatptester/Makefile
+1
-1
1 addition, 1 deletion
hatptester/Makefile
hatptester/depend.mk
+1
-1
1 addition, 1 deletion
hatptester/depend.mk
hatptester/distinfo
+3
-4
3 additions, 4 deletions
hatptester/distinfo
hatptester/patches/patch-aa
+0
-26
0 additions, 26 deletions
hatptester/patches/patch-aa
with
5 additions
and
32 deletions
hatptester/Makefile
+
1
−
1
View file @
1f238d7a
...
...
@@ -3,7 +3,7 @@
#
DISTNAME
=
hatptester-
${
VERSION
}
VERSION
=
1.5.
1
VERSION
=
1.5.
2
PKGREVISION
=
1
CATEGORIES
=
planning
MASTER_SITES
=
${
MASTER_SITE_OPENROBOTS:
=
hatptester/
}
...
...
This diff is collapsed.
Click to expand it.
hatptester/depend.mk
+
1
−
1
View file @
1f238d7a
...
...
@@ -14,7 +14,7 @@ PREFER.hatpconsole?= robotpkg
DEPEND_USE
+=
hatptester
DEPEND_ABI.hatptester
?=
hatptester>
=
1.5.
1
DEPEND_ABI.hatptester
?=
hatptester>
=
1.5.
2
DEPEND_DIR.hatptester
?=
../../wip/hatptester
SYSTEM_SEARCH.hatptester
=
\
...
...
This diff is collapsed.
Click to expand it.
hatptester/distinfo
+
3
−
4
View file @
1f238d7a
SHA1 (hatptester-1.5.1.tar.gz) = eef1f3fbdf785b27ed06394e482959a0f502c70e
RMD160 (hatptester-1.5.1.tar.gz) = 42f12fea553c5d58fc7f9a8fe4d7fb83397d6063
Size (hatptester-1.5.1.tar.gz) = 20942 bytes
SHA1 (patch-aa) = 8f7a581b19bb0a62f2f86642dc2bb298a49cf038
SHA1 (hatptester-1.5.2.tar.gz) = 11b097870a689453d6bd22297cf0c1c6789e37b0
RMD160 (hatptester-1.5.2.tar.gz) = bf730b8957cb482e69b1d5dc6b358d6d8d1dcc2c
Size (hatptester-1.5.2.tar.gz) = 20943 bytes
This diff is collapsed.
Click to expand it.
hatptester/patches/patch-aa
deleted
100644 → 0
+
0
−
26
View file @
5c9da0cc
diff --git CMakeLists.txt CMakeLists.txt
index d790cec..91b7553 100644
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -14,7 +14,7 @@
set(APP_ASSOCIATED_TAG "v${APP_VERSION}") #Tag associated to the software versio
find_package(msgconnector REQUIRED msgconnector)
find_package(Qt4 REQUIRED COMPONENTS QtCore QtGui)
-find_package(Boost REQUIRED thread regex signals program_options system)
+find_package(Boost REQUIRED thread regex signals program_options system date_time)
find_package(Threads)
if(msgconnector_FOUND)
diff --git logger/CMakeLists.txt logger/CMakeLists.txt
index 403a1bb..7236d3c 100644
--- logger/CMakeLists.txt
+++ logger/CMakeLists.txt
@@ -22,7 +22,7 @@
if(ENABLE_LOGGER)
include_directories(${Boost_INCLUDE_DIRS} ${boost-log_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR})
add_library(logger SHARED ${PROJECT_SOURCE_DIR}/logger/logger.cpp)
- target_link_libraries(logger boost_regex-mt boost_date_time-mt ${boost-log_LIBRARIES})
+ target_link_libraries(logger ${boost_LIBRARIES} ${boost-log_LIBRARIES})
set_target_properties(logger PROPERTIES COMPILE_DEFINITIONS "LOGGER_ENABLED")
install(TARGETS logger LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment