From 47307d2b664fef742146b18a7b25fa5730fb0a48 Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Mon, 20 Jul 2015 09:19:10 +0100 Subject: [PATCH] On Travis, build static libraries. --- CMakeLists.txt | 2 ++ install-step.travis.sh | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 51ee8c2e..1ec95c2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -227,6 +227,8 @@ IF (CMAKE_COMPILER_IS_GNUCXX) ENDIF () set (LOOT_LIBS git2 + ssl + curl loadorder${PROJECT_ARCH}) ENDIF () diff --git a/install-step.travis.sh b/install-step.travis.sh index 967163a8..9dc5f559 100644 --- a/install-step.travis.sh +++ b/install-step.travis.sh @@ -23,7 +23,7 @@ cd ../.. wget https://github.com/libgit2/libgit2/archive/v0.23.0.tar.gz -O - | tar -xz mv libgit2-0.23.0 libgit2 mkdir libgit2/build && cd libgit2/build -cmake .. +cmake .. -DBUILD_SHARED_LIBS=OFF make git2 cd ../.. @@ -31,6 +31,6 @@ cd ../.. wget https://github.com/WrinklyNinja/libloadorder/archive/master.tar.gz -O - | tar -xz mv libloadorder-master libloadorder mkdir libloadorder/build && cd libloadorder/build -cmake .. -DPROJECT_ARCH=64 -DPROJECT_STATIC_RUNTIME=OFF -DGTEST_ROOT=../gtest-1.7.0 +cmake .. -DPROJECT_ARCH=64 -DPROJECT_STATIC_RUNTIME=OFF -DBUILD_SHARED_LIBS=OFF -DGTEST_ROOT=../gtest-1.7.0 make loadorder64 cd ../..