[cmake-commits] hoffman committed CMakeLists.txt 1.311 1.312 cmake.cxx 1.274 1.275

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv22557/Source

Modified Files:
	CMakeLists.txt cmake.cxx 
Log Message:
ENH: fix errors for unix builds


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CMakeLists.txt,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -d -r1.311 -r1.312
--- CMakeLists.txt	29 Nov 2006 22:02:35 -0000	1.311
+++ CMakeLists.txt	29 Nov 2006 22:45:55 -0000	1.312
@@ -406,7 +406,11 @@
   IF(CMAKE_CONFIGURATION_TYPES)
     SET(LIBNAME_DIR Debug)
   ENDIF(CMAKE_CONFIGURATION_TYPES)
-
+  IF(WIN32)
+    SET(RUN_DIR "${CMake_BINARY_DIR}/Tests/LibName/lib/${LIBNAME_DIR}")
+  ELSE(WIN32)
+    SET(RUN_DIR "${CMake_BINARY_DIR}/Tests/LibName/")
+  ENDIF(WIN32)
   ADD_TEST(LibName ${CMAKE_CTEST_COMMAND}
     --build-and-test
     "${CMake_SOURCE_DIR}/Tests/LibName"
@@ -415,7 +419,7 @@
     --build-generator ${CMAKE_TEST_GENERATOR}
     --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
     --build-project LibName 
-    --build-run-dir "${CMake_BINARY_DIR}/Tests/LibName/lib/${LIBNAME_DIR}"
+    --build-run-dir "${RUN_DIR}"
     --test-command foobar
     )
 

Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -d -r1.274 -r1.275
--- cmake.cxx	29 Nov 2006 20:59:16 -0000	1.274
+++ cmake.cxx	29 Nov 2006 22:45:55 -0000	1.275
@@ -23,11 +23,11 @@
 #include "cmCommand.h"
 #include "cmFileTimeComparison.h"
 #include "cmGeneratedFileStream.h"
+#include "cmVersion.h"
 
 #if defined(CMAKE_BUILD_WITH_CMAKE)
 # include "cmDependsFortran.h" // For -E cmake_copy_f90_mod callback.
 # include "cmVariableWatch.h"
-# include "cmVersion.h"
 # include <cmsys/Terminal.h>
 #endif