[Plplot-cvs] SF.net SVN: plplot:[12260] trunk/cmake/modules

[<ai...@us...>]

Revision: 12260
          http://plplot.svn.sourceforge.net/plplot/?rev=12260&view=rev
Author:   airwin
Date:     2012-10-30 01:31:18 +0000 (Tue, 30 Oct 2012)
Log Message:
-----------
Adjust to backwards-incompatible change in CMake language support
infrastructure that is introduced as of CMake-2.8.10.  Result
works for CMake-2.8.10-rc3 as well as previous CMake versions.

Modified Paths:
--------------
    trunk/cmake/modules/language_support/cmake/CMakeDetermineAdaCompiler.cmake
    trunk/cmake/modules/language_support/cmake/CMakeDetermineDCompiler.cmake
    trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake
    trunk/cmake/modules/language_support.cmake
    trunk/cmake/modules/plplot.cmake

Modified: trunk/cmake/modules/language_support/cmake/CMakeDetermineAdaCompiler.cmake
===================================================================
--- trunk/cmake/modules/language_support/cmake/CMakeDetermineAdaCompiler.cmake	2012-10-30 01:29:43 UTC (rev 12259)
+++ trunk/cmake/modules/language_support/cmake/CMakeDetermineAdaCompiler.cmake	2012-10-30 01:31:18 UTC (rev 12260)
@@ -55,8 +55,11 @@
 
 # configure variables set in this file for fast reload later on
 #CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeAdaCompiler.cmake.in 
+#message(STATUS "DEBUG: CMAKE_BINARY_DIR = ${CMAKE_BINARY_DIR}")
+#message(STATUS "DEBUG: CMAKE_FILES_DIRECTORY = ${CMAKE_FILES_DIRECTORY}")
+#message(STATUS "DEBUG: CMAKE_PLATFORM_INFO_DIR = ${CMAKE_PLATFORM_INFO_DIR}")
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeAdaCompiler.cmake.in 
-               "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeAdaCompiler.cmake" IMMEDIATE)
+               "${CMAKE_PLATFORM_INFO_DIR}/CMakeAdaCompiler.cmake" IMMEDIATE)
 MARK_AS_ADVANCED(CMAKE_AR)
 
 SET(CMAKE_Ada_COMPILER_ENV_VAR "ADA")

Modified: trunk/cmake/modules/language_support/cmake/CMakeDetermineDCompiler.cmake
===================================================================
--- trunk/cmake/modules/language_support/cmake/CMakeDetermineDCompiler.cmake	2012-10-30 01:29:43 UTC (rev 12259)
+++ trunk/cmake/modules/language_support/cmake/CMakeDetermineDCompiler.cmake	2012-10-30 01:31:18 UTC (rev 12260)
@@ -99,10 +99,10 @@
 # a different location.
 IF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in)
 	CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in 
-               "${CMAKE_PLATFORM_ROOT_BIN}/CMakeDCompiler.cmake" IMMEDIATE)
+               "${CMAKE_PLATFORM_INFO_DIR}/CMakeDCompiler.cmake" IMMEDIATE)
 ELSE(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in)
 	CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeDCompiler.cmake.in 
-               "${CMAKE_PLATFORM_ROOT_BIN}/CMakeDCompiler.cmake" IMMEDIATE)
+               "${CMAKE_PLATFORM_INFO_DIR}/CMakeDCompiler.cmake" IMMEDIATE)
 ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in)
 
 MARK_AS_ADVANCED(CMAKE_AR)

Modified: trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake
===================================================================
--- trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake	2012-10-30 01:29:43 UTC (rev 12259)
+++ trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake	2012-10-30 01:31:18 UTC (rev 12260)
@@ -68,10 +68,10 @@
   # a different location.
   IF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in)
   	CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in 
-  	  ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeDCompiler.cmake IMMEDIATE)
+  	  ${CMAKE_PLATFORM_INFO_DIR}/CMakeDCompiler.cmake IMMEDIATE)
   ELSE(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in)
   	CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeDCompiler.cmake.in 
-	  ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeDCompiler.cmake IMMEDIATE)
+	  ${CMAKE_PLATFORM_INFO_DIR}/CMakeDCompiler.cmake IMMEDIATE)
   ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in)
 ENDIF(NOT CMAKE_D_COMPILER_WORKS)
 

Modified: trunk/cmake/modules/language_support.cmake
===================================================================
--- trunk/cmake/modules/language_support.cmake	2012-10-30 01:29:43 UTC (rev 12259)
+++ trunk/cmake/modules/language_support.cmake	2012-10-30 01:31:18 UTC (rev 12260)
@@ -19,6 +19,13 @@
   ${PROJECT_SOURCE_DIR}/cmake/modules/language_support/cmake
   ${PROJECT_SOURCE_DIR}/cmake/modules/language_support/cmake-2.8
   )
+
+# Need to define CMAKE_PLATFORM_INFO_DIR for all CMake versions less than 2.8.10
+if(NOT CMAKE_PLATFORM_INFO_DIR)
+  set(CMAKE_PLATFORM_INFO_DIR \${CMAKE_BINARY_DIR}\${CMAKE_FILES_DIRECTORY})
+  message(STATUS 'CMAKE_PLATFORM_INFO_DIR = \${CMAKE_PLATFORM_INFO_DIR}')
+endif(NOT CMAKE_PLATFORM_INFO_DIR)
+
 if(CMAKE_SYSTEM_NAME STREQUAL \"Linux\")
   # We prefer to support only the latest CMake version because it
   # tends to be more free of issues and more consistent with recent

Modified: trunk/cmake/modules/plplot.cmake
===================================================================
--- trunk/cmake/modules/plplot.cmake	2012-10-30 01:29:43 UTC (rev 12259)
+++ trunk/cmake/modules/plplot.cmake	2012-10-30 01:31:18 UTC (rev 12260)
@@ -448,6 +448,13 @@
 "All language bindings are disabled by default"
 OFF
 )
+
+# Need to define CMAKE_PLATFORM_INFO_DIR for all CMake versions less than 2.8.10
+if(NOT CMAKE_PLATFORM_INFO_DIR)
+  set(CMAKE_PLATFORM_INFO_DIR ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY})
+  message(STATUS "CMAKE_PLATFORM_INFO_DIR = ${CMAKE_PLATFORM_INFO_DIR}")
+endif(NOT CMAKE_PLATFORM_INFO_DIR)
+
 # Temporary workaround for language support that is required.
 include(language_support)
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.