Skip to content

Disabling versioning for Android #920

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Disabling versioning for Android #920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bbdfdf7
Disabling versioning for Android
borisfom Jan 20, 2017
c8fb071
Disabling versioning for Android
borisfom Jan 20, 2017
6bd801e
Merge branch 'android' of github.com:borisfom/torch7 into android
borisfom Jan 25, 2017
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
16 changes: 9 additions & 7 deletions lib/TH/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <stdatomic.h>
Expand Down
8 changes: 5 additions & 3 deletions lib/luaT/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down