Commit e650253d authored by plensing's avatar plensing Committed by GitHub
Browse files

OSX: Fixing issues with automatic versioning and installation target (#49) 

Fix: Generated library version could incorrectly contain spaces
Fix: lib64 installation target was set in OSX
parent 84c214f2

CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ endif () 
execute_process(

        COMMAND git log --oneline

        COMMAND wc -l

        COMMAND tr -d [:space:]

        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}

        OUTPUT_VARIABLE GIT_COMMITS

        OUTPUT_STRIP_TRAILING_WHITESPACE

)

set(PROJECT_VERSION_MAJOR 0)

set(PROJECT_VERSION_MINOR 3)
@@ -259,7 +259,7 @@ set_target_properties(kinetic_client PROPERTIES VERSION ${PROJECT_VERSION} SOVER 


get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)

set(LIBSUFFIX "")

if ("${LIB64}" STREQUAL "TRUE" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")

if (NOT APPLE AND "${LIB64}" STREQUAL "TRUE" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")

    set(LIBSUFFIX 64)

endif ()

message(STATUS "Library installation directory is set to ${CMAKE_INSTALL_PREFIX}/lib${LIBSUFFIX}")