Skip to content

Cmake fixes #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zgyarmati wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Cmake fixes #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
19b4fd0
rename test binary to test-toml to avoid cmake warning Policy CMP0037
zgyarmati Feb 12, 2019
17f14d5
cmake: fix out-of-tree compilation by prefixing the RAGEL source file
zgyarmati Feb 12, 2019
d1d1492
cmake: set mandatory dependencies to REQUIRED, so cmake will explicit…
zgyarmati Feb 12, 2019
3e984b0
delete duplicated build_assert.h file
zgyarmati Feb 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ libtoml.dylib
libtoml.so
main
main.o
test
test-toml
test.o
toml.o
toml_parse.c
Expand Down
17 changes: 13 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
PROJECT(libtoml)

FIND_PROGRAM(RAGEL ragel)
if(NOT RAGEL)
message(FATAL_ERROR "Ragel executable not found!")
endif()

FIND_PACKAGE(PkgConfig)
PKG_CHECK_MODULES(PC_LIBICU icu-uc)
PKG_CHECK_MODULES(PC_LIBICU REQUIRED icu-uc)
PKG_CHECK_MODULES(PC_CUNIT cunit)

SET(RAGEL_SRCS toml_parse.rl)
SET(RAGEL_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/toml_parse.rl)

SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)
INCLUDE_DIRECTORIES(${PC_LIBICU_INCLUDE_DIRS} ${PC_CUNIT_INCLUDE_DIRS})
Expand All @@ -32,5 +36,10 @@ TARGET_LINK_LIBRARIES(toml ${PC_LIBICU_LIBRARIES})

ADD_EXECUTABLE(main main.c)
TARGET_LINK_LIBRARIES(main toml ${PC_LIBICU_LIBRARIES})
ADD_EXECUTABLE(test test.c)
TARGET_LINK_LIBRARIES(test toml ${PC_LIBICU_LIBRARIES} ${PC_CUNIT_LIBRARIES})

if(NOT PC_CUNIT_FOUND)
message(WARNING "CUnit was not found, not building tests")
else()
ADD_EXECUTABLE(test-toml test.c)
TARGET_LINK_LIBRARIES(test-toml toml ${PC_LIBICU_LIBRARIES} ${PC_CUNIT_LIBRARIES})
endif()
39 changes: 0 additions & 39 deletions ccan/build_assert.h
View file
Open in desktop

This file was deleted.