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

Added the option to disable the building of example binaries in the cmake build system. #91

Closed
wants to merge 7 commits into from
+23 −16
Closed

Added the option to disable the building of example binaries in the cmake build system. #91

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
173185d
Added the option to disable the building of example binaries in the
Cyberunner23 Feb 28, 2015
706cf4e
Added an option to compile the static library with -fPIC in the cmake
Cyberunner23 Mar 8, 2015
3f6a823
It would help if -fPIC was in the compile flags...
Cyberunner23 Mar 8, 2015
eef7727
A bit of cmake debigging...
Cyberunner23 Mar 12, 2015
c985b34
More cmake debugging with Travis...
Cyberunner23 Mar 12, 2015
8e1f438
Trying to igure out why fpic is not firing on travis.
Cyberunner23 Mar 12, 2015
31862bc
Issue fixed with Travis build.
Cyberunner23 Mar 12, 2015
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
39 changes: 23 additions & 16 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ project(zlib C)

set(VERSION "1.2.8")

option(ASM686 "Enable building i686 assembly implementation")
option(AMD64 "Enable building amd64 assembly implementation")
option(ASM686 "Enable building i686 assembly implementation")
option(AMD64 "Enable building amd64 assembly implementation")
option(DISABLE_EXAMPLE_BINARIES "Disable the building of example binaries")
option(COMPILE_STATIC_LIB_WITH_FPIC "use -fPIC when compiling the static lib.")

set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
Expand Down Expand Up @@ -201,6 +203,9 @@ endif()

if(UNIX)
# On unix-like platforms the library is almost always called libz
if(COMPILE_STATIC_LIB_WITH_FPIC)
set_target_properties(zlibstatic PROPERTIES COMPILE_FLAGS "-fPIC")
endif()
set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
if(NOT APPLE)
set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
Expand Down Expand Up @@ -230,20 +235,22 @@ endif()
# Example binaries
#============================================================================

add_executable(example test/example.c)
target_link_libraries(example zlib)
add_test(example example)
if(NOT DISABLE_EXAMPLE_BINARIES)
add_executable(example test/example.c)
target_link_libraries(example zlib)
add_test(example example)

add_executable(minigzip test/minigzip.c)
target_link_libraries(minigzip zlib)
add_executable(minigzip test/minigzip.c)
target_link_libraries(minigzip zlib)

if(HAVE_OFF64_T)
add_executable(example64 test/example.c)
target_link_libraries(example64 zlib)
set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
add_test(example64 example64)

add_executable(minigzip64 test/minigzip.c)
target_link_libraries(minigzip64 zlib)
set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
if(HAVE_OFF64_T)
add_executable(example64 test/example.c)
target_link_libraries(example64 zlib)
set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
add_test(example64 example64)

add_executable(minigzip64 test/minigzip.c)
target_link_libraries(minigzip64 zlib)
set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
endif()
endif()