|
From: <ai...@us...> - 2014-02-07 05:43:00
|
Revision: 12982
http://sourceforge.net/p/plplot/code/12982
Author: airwin
Date: 2014-02-07 05:42:56 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
Do not allow a cmake build for the MSYS platform case for the
reasons mentioned in cmake/epa_build/README.
Modified Paths:
--------------
trunk/cmake/epa_build/CMakeLists.txt
Modified: trunk/cmake/epa_build/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/CMakeLists.txt 2014-02-07 02:49:25 UTC (rev 12981)
+++ trunk/cmake/epa_build/CMakeLists.txt 2014-02-07 05:42:56 UTC (rev 12982)
@@ -378,7 +378,6 @@
# Order does not matter because the dependency logic takes
# care of any ordering issues.
set(subdirectories_LIST
- cmake
pkg-config
##subversion
swig
@@ -395,6 +394,15 @@
# iwidgets (version 4.0.1)
iwidgets4.0
)
+ if(NOT MSYS_PLATFORM)
+ # Required system version of libcurl, an essential cmake build
+ # dependency, is not currently (until the epa_build project
+ # configures that build) available for the MSYS_PLATFORM. So only
+ # allow the potential to build the cmake buildtool for the
+ # non-MSYS platform case. And for the MSYS platform case use a
+ # binary version of CMake supplied by Kitware.
+ list(APPEND subdirectories_LIST cmake)
+ endif(NOT MSYS_PLATFORM)
else(BUILD_THE_BUILDTOOLS)
# List sufficient normal package configurations so they will suck in
# the remaining configurations via dependencies.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|