Commit 1cf83fd8 authored by Adam Radziszewski's avatar Adam Radziszewski

fix build on Fedora

parent 43ae19b2
......@@ -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)
......
......@@ -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)
......
......@@ -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());
}
}
}
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment