root
/
aseprite
mirror of https://github.com/aseprite/aseprite.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Remove some remaining parts of USE_SHARED_GTEST option

This commit is contained in:
David Capello 2015-06-09 10:54:04 -03:00
parent be0f0892e2
commit 47a05434fe
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -12,14 +12,14 @@ env:
before_install: before_install:
- if [ "$CXX" = "g++" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi - if [ "$CXX" = "g++" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi
- sudo apt-get update -qq - sudo apt-get update -qq
- if [ "$SHARED" == "ON" ]; then sudo apt-get install -y libcurl4-openssl-dev libgif-dev libjpeg-dev libz-dev libpng-dev libtinyxml-dev libgtest-dev libpixman-1-dev liballegro4.2-dev ; fi - if [ "$SHARED" == "ON" ]; then sudo apt-get install -y libcurl4-openssl-dev libgif-dev libjpeg-dev libz-dev libpng-dev libtinyxml-dev libpixman-1-dev liballegro4.2-dev ; fi
- if [ "$CXX" = "g++" ]; then sudo apt-get install -y -qq g++-4.8; fi - if [ "$CXX" = "g++" ]; then sudo apt-get install -y -qq g++-4.8; fi
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"; fi - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"; fi
before_script: before_script:
- mkdir build - mkdir build
- cd build - cd build
- cmake .. -DUSE_SHARED_CURL=$SHARED -DUSE_SHARED_GIFLIB=$SHARED -DUSE_SHARED_JPEGLIB=$SHARED -DUSE_SHARED_ZLIB=$SHARED -DUSE_SHARED_LIBPNG=$SHARED -DUSE_SHARED_TINYXML=$SHARED -DUSE_SHARED_GTEST=$SHARED -DUSE_SHARED_PIXMAN=$SHARED -DUSE_SHARED_ALLEGRO4=$SHARED - cmake .. -DUSE_SHARED_CURL=$SHARED -DUSE_SHARED_GIFLIB=$SHARED -DUSE_SHARED_JPEGLIB=$SHARED -DUSE_SHARED_ZLIB=$SHARED -DUSE_SHARED_LIBPNG=$SHARED -DUSE_SHARED_TINYXML=$SHARED -DUSE_SHARED_PIXMAN=$SHARED -DUSE_SHARED_ALLEGRO4=$SHARED
script: script:
- "make" - "make"

4
CMakeLists.txt
View File

@ -129,10 +129,8 @@ else()
endif() endif()
# Fix to compile gtest with VC11 (2012) # Fix to compile gtest with VC11 (2012)
if(NOT USE_SHARED_GTEST) if (MSVC_VERSION EQUAL 1700)
if (MSVC_VERSION EQUAL 1700)
add_definitions(-D_VARIADIC_MAX=10) add_definitions(-D_VARIADIC_MAX=10)
endif()
endif() endif()
if(NOT USE_SHARED_CURL) if(NOT USE_SHARED_CURL)

2
src/CMakeLists.txt
View File

@ -288,10 +288,8 @@ function(find_tests dir dependencies)
file(GLOB tests ${CMAKE_CURRENT_SOURCE_DIR}/${dir}/*_tests.cpp) file(GLOB tests ${CMAKE_CURRENT_SOURCE_DIR}/${dir}/*_tests.cpp)
list(REMOVE_AT ARGV 0) list(REMOVE_AT ARGV 0)
if(NOT USE_SHARED_GTEST)
# Add gtest include directory so we can #include <gtest/gtest.h> in tests source code # Add gtest include directory so we can #include <gtest/gtest.h> in tests source code
include_directories(${CMAKE_SOURCE_DIR}/third_party/gtest/include) include_directories(${CMAKE_SOURCE_DIR}/third_party/gtest/include)
endif()
# See if the test is linked with "she" library. # See if the test is linked with "she" library.
list(FIND dependencies she link_with_she) list(FIND dependencies she link_with_she)