|
From: <ai...@us...> - 2014-04-26 02:36:47
|
Revision: 13110
http://sourceforge.net/p/plplot/code/13110
Author: airwin
Date: 2014-04-26 02:36:45 +0000 (Sat, 26 Apr 2014)
Log Message:
-----------
Bump CMake minimum version to 2.8.12.1 for epa_build project
which insures (among other things) that CMake has the ability
to unpack tar.xz files on Unix and MSYS.
Drop configuration of the qt4_lite epa_build since an epa_build and
install of qt4_lite interferes with the epa_build of qt5_lite and vice
versa.
Modified Paths:
--------------
trunk/cmake/epa_build/CMakeLists.txt
Modified: trunk/cmake/epa_build/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/CMakeLists.txt 2014-04-26 02:22:04 UTC (rev 13109)
+++ trunk/cmake/epa_build/CMakeLists.txt 2014-04-26 02:36:45 UTC (rev 13110)
@@ -26,7 +26,7 @@
message(STATUS "CMAKE_GENERATOR = ${CMAKE_GENERATOR}")
message(STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}")
-cmake_minimum_required(VERSION 2.8.11.2 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.8.12.1 FATAL_ERROR)
set(EPA_BASE ${CMAKE_BINARY_DIR}/epa_build)
message(STATUS "EPA_BASE = ${EPA_BASE}")
@@ -417,7 +417,11 @@
plplot_lite
gtk+
wxwidgets
- qt4_lite
+ # qt4_lite install interferes with qt5_lite build and vice versa.
+ # Therefore, we have commented out the build configuration of
+ # qt4_lite and have chosen to use the build_configuration of
+ # qt5_lite instead.
+ # qt4_lite
qt5_lite
)
endif(BUILD_THE_BUILDTOOLS)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|