Skip to content

Commit

Permalink
Core/Build: Make travis-ci happy with CPR library enable and minor fi…
Browse files Browse the repository at this point in the history
…x for player.cpp file. (#75)
  • Loading branch information
devil1234 authored and Traesh committed Aug 13, 2018
1 parent 23d466a commit 0230359
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ install:
- mysql -uroot -e 'create database test_mysql;'
- mkdir bin
- cd bin
- cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=dynamic -DSERVERS=1 -DNOJEM=1 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_INSTALL_PREFIX=check_install -DWITH_CPR=0
- cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=dynamic -DSERVERS=1 -DNOJEM=1 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_INSTALL_PREFIX=check_install -DWITH_CPR=1
- cd ..
- chmod +x contrib/check_updates.sh

Expand Down
2 changes: 1 addition & 1 deletion dep/cpr/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ set(GENERATE_COVERAGE OFF)
cpr_option(CPR_CURL_NOSIGNAL "Set to ON to disable use of signals in libcurl." OFF)
cpr_option(USE_SYSTEM_GTEST
"If ON, this project will look in the system paths for an installed gtest library" OFF)
cpr_option(CMAKE_USE_OPENSSL "Use OpenSSL code. Experimental" ON)
cpr_option(CMAKE_USE_OPENSSL "Use OpenSSL code. Experimental" OFF)
message(STATUS "=======================================================")

add_subdirectory(opt)
Expand Down
1 change: 1 addition & 0 deletions dep/cpr/cpr/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ add_library(${CPR_LIBRARIES} STATIC
"${CPR_INCLUDE_DIRS}/cpr/ssl_options.h")

message(STATUS "Using CURL_LIBRARIES: ${CURL_LIBRARIES}.")
set_property(TARGET ${CPR_LIBRARIES} PROPERTY POSITION_INDEPENDENT_CODE ON)
target_link_libraries(${CPR_LIBRARIES}
${CURL_LIBRARIES})

Expand Down
2 changes: 1 addition & 1 deletion dep/cpr/cpr/session.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <algorithm>
#include <functional>
#include <string>

#define CURL_STATICLIB
#include <curl/curl.h>

#include "cpr/curlholder.h"
Expand Down
1 change: 1 addition & 0 deletions dep/cpr/opt/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ if(NOT USE_SYSTEM_CURL OR NOT CURL_FOUND)
endif()

set_property(TARGET libcurl PROPERTY FOLDER "external")
set_property(TARGET libcurl PROPERTY POSITION_INDEPENDENT_CODE ON)
endif()

set_cache_variable(CURL_FOUND "Set if libcurl is found or built")
Expand Down
2 changes: 1 addition & 1 deletion dep/cpr/opt/curl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ include_directories( ${CURL_SOURCE_DIR}/include )
option(CURL_WERROR "Turn compiler warnings into errors" OFF)
set(PICKY_COMPILER ON)
set(BUILD_CURL_EXE OFF)
option(CURL_STATICLIB "Set to ON to build libcurl with static linking." OFF)
option(CURL_STATICLIB "Set to ON to build libcurl with static linking." ON)
option(ENABLE_ARES "Set to ON to enable c-ares support" OFF)
if(WIN32)
option(CURL_STATIC_CRT "Set to ON to build libcurl with static CRT on Windows (/MT)." OFF)
Expand Down
2 changes: 1 addition & 1 deletion src/server/game/Entities/Player/Player.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26540,7 +26540,7 @@ void Player::StoreLootItem(uint8 lootSlot, Loot* loot, AELootResult* aeResult/*
if (Guild* guild = GetGuild())
guild->AddGuildNews(GUILD_NEWS_ITEM_LOOTED, GetGUID(), 0, item->itemid);

TC_LOG_INFO("metric", "%s(%u) looted item %u count %u",
TC_LOG_INFO("metric", "%s(%lu) looted item %u count %u",
GetName().c_str(), GetGUID().GetCounter(),
item->itemid, item->count);
}
Expand Down

0 comments on commit 0230359

Please sign in to comment.