Showing with 5 additions and 2 deletions.
  1. +4 −1 CMakeLists.txt
  2. +1 −1 cmake/mingw-release-build-deps.bat
5 changes: 4 additions & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ if(kst_clang)
set(CMAKE_CXX_COMPILER "clang++" CACHE PATH "Clang C++ compiler")
endif()

cmake_policy(SET CMP0020 OLD)
if(${CMAKE_MAJOR_VERSION} EQUAL 3)
cmake_policy(SET CMP0043 OLD)
endif()

# figure out if we use MinGW with Ninja: call with -DCC=gcc
if(WIN32 AND CMAKE_GENERATOR MATCHES Ninja AND CC MATCHES gcc)
Expand Down Expand Up @@ -166,7 +170,6 @@ message(STATUS)
# Find 3rd party libraries
if (kst_qt5)
# http://doc-snapshot.qt-project.org/5.0/cmake-manual.html
cmake_minimum_required(VERSION 2.8.9)
macro(use_qt5lib qt5lib)
find_package(${qt5lib} REQUIRED)
include_directories(${${qt5lib}_INCLUDE_DIRS})
Expand Down
2 changes: 1 addition & 1 deletion cmake/mingw-release-build-deps.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ set build=1

echo on

cmake %kstdir% -G%gen% -Dkst_release=1 -Dkst_merge_files=0 -Dkst_3rdparty_download=%download% -Dkst_3rdparty_build=%build% -Dkst_install_prefix=Kst-%ver% -Dkst_version_string=%ver% -Dkst_make_program=%make%
cmake %kstdir% -G%gen% -Dkst_qt5=1 -Dkst_release=1 -Dkst_merge_files=0 -Dkst_3rdparty_download=%download% -Dkst_3rdparty_build=%build% -Dkst_install_prefix=Kst-%ver% -Dkst_version_string=%ver% -Dkst_make_program=%make%

%make% netcdf

Expand Down