Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
toki
Manage
Activity
Members
Labels
Plan
Issues
2
Issue boards
Milestones
Wiki
Redmine
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Analysers
toki
Commits
1cf83fd8
Commit
1cf83fd8
authored
13 years ago
by
Adam Radziszewski
Browse files
Options
Downloads
Patches
Plain Diff
fix build on Fedora
parent
43ae19b2
Branches
Branches containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
tests/CMakeLists.txt
+4
-1
4 additions, 1 deletion
tests/CMakeLists.txt
tests/compare.cpp
+3
-3
3 additions, 3 deletions
tests/compare.cpp
toki-app/CMakeLists.txt
+4
-1
4 additions, 1 deletion
toki-app/CMakeLists.txt
with
12 additions
and
6 deletions
CMakeLists.txt
+
1
−
1
View file @
1cf83fd8
...
...
@@ -41,7 +41,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
endif
(
NOT CONFIGURED
)
endif
(
CMAKE_COMPILER_IS_GNUCXX
)
find_package
(
Boost 1.41 REQUIRED COMPONENTS program_options filesystem regex
)
find_package
(
Boost 1.41 REQUIRED COMPONENTS program_options filesystem
system
regex
)
add_subdirectory
(
libtoki
)
add_subdirectory
(
tests
)
...
...
This diff is collapsed.
Click to expand it.
tests/CMakeLists.txt
+
4
−
1
View file @
1cf83fd8
...
...
@@ -13,11 +13,14 @@ add_executable(tests
regex.cpp
)
target_link_libraries
(
tests toki
${
Boost_LIBRARIES
}
)
target_link_libraries
(
tests toki
${
Boost_LIBRARIES
}
${
ICU_LIBRARY
}
)
include_directories
(
${
Boost_INCLUDE_DIR
}
)
link_directories
(
${
Boost_LIBRARY_DIRS
}
)
include_directories
(
${
ICU_INCLUDE_DIR
}
)
link_directories
(
${
ICU_LIBRARY_DIRS
}
)
configure_file
(
test-sanity.sh
${
CMAKE_CURRENT_BINARY_DIR
}
)
add_custom_target
(
test tests COMMAND ./test-sanity.sh small
)
...
...
This diff is collapsed.
Click to expand it.
tests/compare.cpp
+
3
−
3
View file @
1cf83fd8
...
...
@@ -160,11 +160,11 @@ void init_subdir(fs::path dir)
subdirs
.
insert
(
itr
->
path
());
}
else
{
if
(
itr
->
path
().
extension
()
==
".in"
)
{
tests_in
.
insert
(
itr
->
path
().
stem
());
tests_in
.
insert
(
itr
->
path
().
stem
()
.
c_str
()
);
}
else
if
(
itr
->
path
().
extension
()
==
".out"
)
{
tests_out
.
insert
(
itr
->
path
().
stem
());
tests_out
.
insert
(
itr
->
path
().
stem
()
.
c_str
()
);
}
else
if
(
itr
->
path
().
extension
()
==
".ini"
)
{
configs
.
insert
(
itr
->
path
().
stem
());
configs
.
insert
(
itr
->
path
().
stem
()
.
c_str
()
);
}
}
}
...
...
This diff is collapsed.
Click to expand it.
toki-app/CMakeLists.txt
+
4
−
1
View file @
1cf83fd8
...
...
@@ -4,11 +4,14 @@ include_directories( ${CMAKE_SOURCE_DIR} )
add_executable
(
toki-app main.cpp
)
target_link_libraries
(
toki-app toki
${
Boost_LIBRARIES
}
)
target_link_libraries
(
toki-app toki
${
Boost_LIBRARIES
}
${
ICU_LIBRARY
}
)
include_directories
(
${
Boost_INCLUDE_DIR
}
)
link_directories
(
${
Boost_LIBRARY_DIRS
}
)
include_directories
(
${
ICU_INCLUDE_DIR
}
)
link_directories
(
${
ICU_LIBRARY_DIRS
}
)
if
(
UNIX
)
install
(
TARGETS toki-app
RUNTIME DESTINATION bin
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
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