Skip to content
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

Jump to bottom

rebased cmake updates #147

Merged
merged 4 commits into from
Mar 30, 2019
Merged

rebased cmake updates #147

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4534ad4
Use a target property instead of CMAKE_C_FLAGS
per-gron Jan 22, 2016
a541a25
Use target properties instead of add_definitions
Jan 22, 2016
938aba3
Expose header search path with target_include_directories
Jan 22, 2016
71bbec9
more rebase fixes
stevengj Mar 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 10 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,14 @@ set(SO_MAJOR 2)
set(SO_MINOR 2)
set(SO_PATCH 0)

if (NOT MSVC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -std=c99 -pedantic -Wall")
endif ()

add_library (utf8proc
utf8proc.c
utf8proc.h
)

# expose header path, for when this is part of a larger cmake project
target_include_directories(utf8proc PUBLIC ../utf8proc)

if (BUILD_SHARED_LIBS)
# Building shared library
else()
Expand All @@ -34,6 +33,13 @@ endif()

target_compile_definitions(utf8proc PRIVATE "UTF8PROC_EXPORTS")

if (NOT MSVC)
set_target_properties(
utf8proc PROPERTIES
COMPILE_FLAGS "-O2 -std=c99 -pedantic -Wall"
)
endif ()

set_target_properties (utf8proc PROPERTIES
POSITION_INDEPENDENT_CODE ON
VERSION "${SO_MAJOR}.${SO_MINOR}.${SO_PATCH}"
Expand Down