code cleanup and bugfixes.
From 51a441c514beede832361efa8f9b4c7a18837c49 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava <[email protected]> Date: Thu, 17 Dec 2015 14:01:28 -0200 Subject: [PATCH 1/5] Remove depreceated calls to -DLIBGIT23
Signed-off-by: Tomaz Canabrava <[email protected]> --- cmake/Modules/HandleFindGit2.cmake | 8 -------- 1 file changed, 8 deletions(-) diff --git a/cmake/Modules/HandleFindGit2.cmake b/cmake/Modules/HandleFindGit2.cmake index e0bb997..34db7b6 100644 --- a/cmake/Modules/HandleFindGit2.cmake +++ b/cmake/Modules/HandleFindGit2.cmake @@ -2,9 +2,6 @@ if(LIBGIT2_FROM_PKGCONFIG) pkg_config_library(LIBGIT2 libgit2 REQUIRED) set(LIBGIT2_LIBRARIES "") - if(USE_LIBGIT23_API) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_LIBGIT23_API") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_LIBGIT23_API") if(ANDROID) # for Android we need to force a static link against ssl and crypto # this is a bit hacky, but it seems to work @@ -14,13 +11,9 @@ if(LIBGIT2_FROM_PKGCONFIG) pkg_config_library(LIBSSH2 libssh2 REQUIRED) set(LIBGIT2_LIBRARIES ${LIBGIT2_LIBRARIES} ${LIBSSH2_LIBRARIES}) endif() - endif() else() find_package(LIBGIT2 REQUIRED) include_directories(${LIBGIT2_INCLUDE_DIR}) - if(USE_LIBGIT23_API) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_LIBGIT23_API") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_LIBGIT23_API") if(FORCE_LIBSSH) find_package(Libssh2 QUIET CONFIG) if ("${LIBSSH2_VERSION}" STRGREATER "1.6.1") @@ -35,5 +28,4 @@ else() pkg_config_library(LIBCURL libcurl REQUIRED) endif() set(LIBGIT2_LIBRARIES ${LIBGIT2_LIBRARIES} -L${LIBSSH2_LIBRARY_DIRS} ${LIBSSH2_LIBRARIES} ${LIBCURL_LIBRARIES}) - endif() endif() -- 2.6.4
From 9690123cf6a46aa7a21c5c2790fe94a9e2be7614 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava <[email protected]> Date: Thu, 17 Dec 2015 14:01:58 -0200 Subject: [PATCH 2/5] Code cleanup Signed-off-by: Tomaz Canabrava <[email protected]> --- cmake/Modules/HandleFindGit2.cmake | 46 +++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/cmake/Modules/HandleFindGit2.cmake b/cmake/Modules/HandleFindGit2.cmake index 34db7b6..2f88b36 100644 --- a/cmake/Modules/HandleFindGit2.cmake +++ b/cmake/Modules/HandleFindGit2.cmake @@ -2,30 +2,30 @@ if(LIBGIT2_FROM_PKGCONFIG) pkg_config_library(LIBGIT2 libgit2 REQUIRED) set(LIBGIT2_LIBRARIES "") - if(ANDROID) - # for Android we need to force a static link against ssl and crypto - # this is a bit hacky, but it seems to work - set(LIBGIT2_LIBRARIES ${LIBGIT2_LIBRARIES} ${LIBGIT2_LIBRARY_DIRS}/libssl.a ${LIBGIT2_LIBRARY_DIRS}/libcrypto.a) - endif() - if(FORCE_LIBSSH) - pkg_config_library(LIBSSH2 libssh2 REQUIRED) - set(LIBGIT2_LIBRARIES ${LIBGIT2_LIBRARIES} ${LIBSSH2_LIBRARIES}) - endif() + if(ANDROID) + # for Android we need to force a static link against ssl and crypto + # this is a bit hacky, but it seems to work + set(LIBGIT2_LIBRARIES ${LIBGIT2_LIBRARIES} ${LIBGIT2_LIBRARY_DIRS}/libssl.a ${LIBGIT2_LIBRARY_DIRS}/libcrypto.a) + endif() + if(FORCE_LIBSSH) + pkg_config_library(LIBSSH2 libssh2 REQUIRED) + set(LIBGIT2_LIBRARIES ${LIBGIT2_LIBRARIES} ${LIBSSH2_LIBRARIES}) + endif() else() find_package(LIBGIT2 REQUIRED) include_directories(${LIBGIT2_INCLUDE_DIR}) - if(FORCE_LIBSSH) - find_package(Libssh2 QUIET CONFIG) - if ("${LIBSSH2_VERSION}" STRGREATER "1.6.1") - set(LIBSSH2_LIBRARIES Libssh2::libssh2) - endif() - if(!LIBSSH2_FOUND OR "${LIBSSH2_FOUND}" STREQUAL "") - pkg_config_library(LIBSSH2 libssh2 REQUIRED) - endif() - endif() - find_package(libcurl QUIET) - if(!LIBCURL_FOUND OR "${LIBCURL_FOUND}" STREQUAL "") - pkg_config_library(LIBCURL libcurl REQUIRED) - endif() - set(LIBGIT2_LIBRARIES ${LIBGIT2_LIBRARIES} -L${LIBSSH2_LIBRARY_DIRS} ${LIBSSH2_LIBRARIES} ${LIBCURL_LIBRARIES}) + if(FORCE_LIBSSH) + find_package(Libssh2 QUIET CONFIG) + if ("${LIBSSH2_VERSION}" STRGREATER "1.6.1") + set(LIBSSH2_LIBRARIES Libssh2::libssh2) + endif() + if(!LIBSSH2_FOUND OR "${LIBSSH2_FOUND}" STREQUAL "") + pkg_config_library(LIBSSH2 libssh2 REQUIRED) + endif() + endif() + find_package(libcurl QUIET) + if(!LIBCURL_FOUND OR "${LIBCURL_FOUND}" STREQUAL "") + pkg_config_library(LIBCURL libcurl REQUIRED) + endif() + set(LIBGIT2_LIBRARIES ${LIBGIT2_LIBRARIES} -L${LIBSSH2_LIBRARY_DIRS} ${LIBSSH2_LIBRARIES} ${LIBCURL_LIBRARIES}) endif() -- 2.6.4
From 9e5d6e4d1a934f7ce4b848fa804fcbe3b37f3ff3 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava <[email protected]> Date: Thu, 17 Dec 2015 14:28:43 -0200 Subject: [PATCH 3/5] Simplify IF for OSX handling Signed-off-by: Tomaz Canabrava <[email protected]> --- CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f338f0e..255ff62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -154,15 +154,13 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") set(ICON_FILE ${CMAKE_SOURCE_DIR}/packaging/macosx/Subsurface.icns) if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable") set(MACOSX_BUNDLE_INFO_STRING "Subsurface-mobile") - set(MACOSX_BUNDLE_ICON_FILE Subsurface.icns) - set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.subsurface-divelog") set(MACOSX_BUNDLE_BUNDLE_NAME "Subsurface-mobile") else() set(MACOSX_BUNDLE_INFO_STRING "Subsurface") - set(MACOSX_BUNDLE_ICON_FILE Subsurface.icns) - set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.subsurface-divelog") set(MACOSX_BUNDLE_BUNDLE_NAME "Subsurface") endif() + set(MACOSX_BUNDLE_ICON_FILE Subsurface.icns) + set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.subsurface-divelog") set(MACOSX_BUNDLE_BUNDLE_VERSION "${SSRF_VERSION_STRING}") set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${SSRF_VERSION_STRING}") set(MACOSX_BUNDLE_LONG_VERSION_STRING "${SSRF_VERSION_STRING}") -- 2.6.4
From 1c286c3504f4c7b903141f07977ddeec7e8d6803 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava <[email protected]> Date: Thu, 17 Dec 2015 14:33:05 -0200 Subject: [PATCH 4/5] Build on android is a shared library Signed-off-by: Tomaz Canabrava <[email protected]> --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 255ff62..983d48b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -244,7 +244,7 @@ elseif(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "DesktopExecutable") ) source_group("Subsurface App" FILES ${SUBSURFACE_APP}) if(ANDROID) - add_library(${SUBSURFACE_TARGET} MACOSX_BUNDLE WIN32 ${SUBSURFACE_PKG} ${SUBSURFACE_APP} ${SUBSURFACE_RESOURCES}) + add_library(${SUBSURFACE_TARGET} SHARED ${SUBSURFACE_PKG} ${SUBSURFACE_APP} ${SUBSURFACE_RESOURCES}) else() add_executable(${SUBSURFACE_TARGET} MACOSX_BUNDLE WIN32 ${SUBSURFACE_PKG} ${SUBSURFACE_APP} ${SUBSURFACE_RESOURCES}) endif() -- 2.6.4
From 50358685db03eb5ba5070591fbb3b240be7e140d Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava <[email protected]> Date: Thu, 17 Dec 2015 14:48:08 -0200 Subject: [PATCH 5/5] Add build* folders on gitignore Since we can build for more than one platform at the same time now, it's userful to block them on the gitignore to make sure we don't get a dirty tree just because we build for mobile and desktop inside the subsurface folder. Signed-off-by: Tomaz Canabrava <[email protected]> --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 4a34a07..4f21f11 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ subsurface.pro.user* Subsurface.app .DS_Store !android/**/*.xml +build* -- 2.6.4
_______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
