Showing with 17 additions and 9 deletions.
  1. +4 −0 cmake/CMakeLists.txt
  2. +13 −9 cmake/travis.sh
4 changes: 4 additions & 0 deletions cmake/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ kst_option(bool ON all qt5base_only "Only use Qt5 features available in
kst_option(bool ON all opengl "Use OpenGL")
kst_option(bool OFF all clang "Use Clang compiler")
kst_option(bool OFF all sanitize "Use Clang's sanitizers")
kst_option(bool OFF all dbgsym "Build with debug symbols enabled")

message(STATUS)

Expand Down Expand Up @@ -295,6 +296,9 @@ if(MSVC)
add_definitions(-D_USE_MATH_DEFINES -DNOMINMAX)
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
if(dbgsym)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
endif()
endif()

if(MSVC_IDE AND kst_edit_cont)
Expand Down
22 changes: 13 additions & 9 deletions cmake/travis.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,18 +123,22 @@ cd $builddir
#
cmakever=cmake-2.8.10.2-Linux-i386

if [ ! -d /opt/$cmakever ]; then
cmakebin=x
if [ "$iam" = "$travis" ]; then
if [ ! -d /opt/$cmakever ]; then
wget http://www.cmake.org/files/v2.8/$cmakever.tar.gz
checkExitCode
cd /opt
sudo tar xf $builddir/$cmakever.tar.gz
checkExitCode
cd $builddir
cmakebin=x
if [ ! -d /opt/$cmakever ]; then
wget http://www.cmake.org/files/v2.8/$cmakever.tar.gz
checkExitCode
cd /opt
sudo tar xf $builddir/$cmakever.tar.gz
checkExitCode
cd $builddir
fi
fi
cmakebin=/opt/$cmakever/bin/cmake
else
cmakebin=cmake
fi
cmakebin=/opt/$cmakever/bin/cmake
$cmakebin --version
checkExitCode

Expand Down