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

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

Revision: 9870
          http://plplot.svn.sourceforge.net/plplot/?rev=9870&view=rev
Author:   airwin
Date:     2009-05-01 18:14:43 +0000 (Fri, 01 May 2009)

Log Message:
-----------
Replace ${CMAKE_SOURCE_DIR}/cmake/Modules (which does not exist for PLplot
since we use "cmake/modules" instead of "cmake/Modules" ) with more generic
${CMAKE_MODULE_PATH} which works well.  Thanks to Orion Poplawski for
reporting the problem and also giving the fix.

Modified Paths:
--------------
    trunk/cmake/modules/CMakeDetermineDCompiler.cmake
    trunk/cmake/modules/CMakeTestDCompiler.cmake

Modified: trunk/cmake/modules/CMakeDetermineDCompiler.cmake
===================================================================
--- trunk/cmake/modules/CMakeDetermineDCompiler.cmake	2009-05-01 15:11:49 UTC (rev 9869)
+++ trunk/cmake/modules/CMakeDetermineDCompiler.cmake	2009-05-01 18:14:43 UTC (rev 9870)
@@ -95,13 +95,13 @@
 
 
 # configure variables set in this file for fast reload later on
-IF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/Modules/CMakeDCompiler.cmake.in)
-	CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/Modules/CMakeDCompiler.cmake.in 
+IF(EXISTS ${CMAKE_MODULE_PATH}/CMakeDCompiler.cmake.in)
+	CONFIGURE_FILE(${CMAKE_MODULE_PATH}/CMakeDCompiler.cmake.in 
                "${CMAKE_PLATFORM_ROOT_BIN}/CMakeDCompiler.cmake" IMMEDIATE)
-ELSE(EXISTS ${CMAKE_SOURCE_DIR}/cmake/Modules/CMakeDCompiler.cmake.in)
+ELSE(EXISTS ${CMAKE_MODULE_PATH}/CMakeDCompiler.cmake.in)
 	CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeDCompiler.cmake.in 
                "${CMAKE_PLATFORM_ROOT_BIN}/CMakeDCompiler.cmake" IMMEDIATE)
-ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/Modules/CMakeDCompiler.cmake.in)
+ENDIF(EXISTS ${CMAKE_MODULE_PATH}/CMakeDCompiler.cmake.in)
 
 MARK_AS_ADVANCED(CMAKE_AR)
 SET(CMAKE_D_COMPILER_ENV_VAR "DC")

Modified: trunk/cmake/modules/CMakeTestDCompiler.cmake
===================================================================
--- trunk/cmake/modules/CMakeTestDCompiler.cmake	2009-05-01 15:11:49 UTC (rev 9869)
+++ trunk/cmake/modules/CMakeTestDCompiler.cmake	2009-05-01 18:14:43 UTC (rev 9870)
@@ -64,13 +64,13 @@
   # re-configure this file CMakeDCompiler.cmake so that it gets
   # the value for CMAKE_SIZEOF_VOID_P
   # configure variables set in this file for fast reload later on
-  IF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/Modules/CMakeDCompiler.cmake.in)
-  	CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/Modules/CMakeDCompiler.cmake.in 
+  IF(EXISTS ${CMAKE_MODULE_PATH}/CMakeDCompiler.cmake.in)
+  	CONFIGURE_FILE(${CMAKE_MODULE_PATH}/CMakeDCompiler.cmake.in 
   	  ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeDCompiler.cmake IMMEDIATE)
-  ELSE(EXISTS ${CMAKE_SOURCE_DIR}/cmake/Modules/CMakeDCompiler.cmake.in)
+  ELSE(EXISTS ${CMAKE_MODULE_PATH}/CMakeDCompiler.cmake.in)
   	CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeDCompiler.cmake.in 
 	  ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeDCompiler.cmake IMMEDIATE)
-  ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/Modules/CMakeDCompiler.cmake.in)
+  ENDIF(EXISTS ${CMAKE_MODULE_PATH}/CMakeDCompiler.cmake.in)
 ENDIF(NOT CMAKE_D_COMPILER_WORKS)
 
 IF(NOT CMAKE_D_PHOBOS_WORKS)


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