From bbdfdf757d05d9830d2cf5f626f31108c78958a9 Mon Sep 17 00:00:00 2001 From: Boris Fomitchev Date: Thu, 19 Jan 2017 19:18:26 -0800 Subject: [PATCH 1/2] Disabling versioning for Android --- lib/TH/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/TH/CMakeLists.txt b/lib/TH/CMakeLists.txt index ac4dce6c7..41f49bac0 100644 --- a/lib/TH/CMakeLists.txt +++ b/lib/TH/CMakeLists.txt @@ -151,6 +151,7 @@ if(BUILD_STATIC) ADD_LIBRARY(TH_static STATIC ${src}) endif() +IF(NOT ANDROID) IF(NOT TH_SO_VERSION) SET(TH_SO_VERSION 0) ENDIF(NOT TH_SO_VERSION) @@ -158,6 +159,7 @@ MESSAGE(STATUS "TH_SO_VERSION: ${TH_SO_VERSION}") SET_TARGET_PROPERTIES(TH PROPERTIES VERSION ${TH_SO_VERSION} SOVERSION ${TH_SO_VERSION}) +ENDIF() CHECK_C_SOURCE_RUNS(" #include From c8fb071111cef3ae968245cf65a751f9920dc857 Mon Sep 17 00:00:00 2001 From: Boris Fomitchev Date: Thu, 19 Jan 2017 19:18:26 -0800 Subject: [PATCH 2/2] Disabling versioning for Android --- lib/TH/CMakeLists.txt | 16 +++++++++------- lib/luaT/CMakeLists.txt | 8 +++++--- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/lib/TH/CMakeLists.txt b/lib/TH/CMakeLists.txt index ac4dce6c7..370b896b8 100644 --- a/lib/TH/CMakeLists.txt +++ b/lib/TH/CMakeLists.txt @@ -151,13 +151,15 @@ if(BUILD_STATIC) ADD_LIBRARY(TH_static STATIC ${src}) endif() -IF(NOT TH_SO_VERSION) - SET(TH_SO_VERSION 0) -ENDIF(NOT TH_SO_VERSION) -MESSAGE(STATUS "TH_SO_VERSION: ${TH_SO_VERSION}") -SET_TARGET_PROPERTIES(TH PROPERTIES - VERSION ${TH_SO_VERSION} - SOVERSION ${TH_SO_VERSION}) +IF(NOT ANDROID) + IF(NOT TH_SO_VERSION) + SET(TH_SO_VERSION 0) + ENDIF(NOT TH_SO_VERSION) + MESSAGE(STATUS "TH_SO_VERSION: ${TH_SO_VERSION}") + SET_TARGET_PROPERTIES(TH PROPERTIES + VERSION ${TH_SO_VERSION} + SOVERSION ${TH_SO_VERSION}) +ENDIF() CHECK_C_SOURCE_RUNS(" #include diff --git a/lib/luaT/CMakeLists.txt b/lib/luaT/CMakeLists.txt index f33768c70..db0ab4f9a 100644 --- a/lib/luaT/CMakeLists.txt +++ b/lib/luaT/CMakeLists.txt @@ -13,9 +13,11 @@ if(BUILD_STATIC) ADD_LIBRARY(luaT_static STATIC luaT.h luaT.c) endif() -SET_TARGET_PROPERTIES(luaT PROPERTIES - VERSION 0 - SOVERSION 0) +IF(NOT ANDROID) + SET_TARGET_PROPERTIES(luaT PROPERTIES + VERSION 0 + SOVERSION 0) +ENDIF() IF(APPLE) SET_TARGET_PROPERTIES(luaT PROPERTIES