[Cmake-commits] CMake branch, next, updated. v2.8.6-2215-gdeb2cfd

[Bill Hoffman]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  deb2cfdd5b2a37a79452de9aafe3a62f95ebf20d (commit)
       via  1a17fdfd5f2eb83ed7692b99f790f2638fbaf89f (commit)
      from  13a4f9f8c7feb4f1cbff9c8dbd5cb06d55e472a7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=deb2cfdd5b2a37a79452de9aafe3a62f95ebf20d
commit deb2cfdd5b2a37a79452de9aafe3a62f95ebf20d
Merge: 13a4f9f 1a17fdf
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Wed Dec 14 17:50:19 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 14 17:50:19 2011 -0500

    Merge topic 'cmake_add_fortran_subdirectory' into next
    
    1a17fdf Fix test on systems that do not have config directories.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a17fdfd5f2eb83ed7692b99f790f2638fbaf89f
commit 1a17fdfd5f2eb83ed7692b99f790f2638fbaf89f
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Wed Dec 14 17:47:54 2011 -0500
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Wed Dec 14 17:47:54 2011 -0500

    Fix test on systems that do not have config directories.
    
    Fix the test so that it works with regular makefile builds.

diff --git a/Tests/VSGNUFortran/CMakeLists.txt b/Tests/VSGNUFortran/CMakeLists.txt
index e91453c..2e527f9 100644
--- a/Tests/VSGNUFortran/CMakeLists.txt
+++ b/Tests/VSGNUFortran/CMakeLists.txt
@@ -7,11 +7,14 @@ project(VSGNUFortran)
 if(CMAKE_CONFIGURATION_TYPES)
   foreach(config ${CMAKE_CONFIGURATION_TYPES})
     string(TOUPPER "${config}" config)
-    set(ARCHIVE_OUTPUT_DIRECTORY_${config}
+    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${config}
       "${PROJECT_BINARY_DIR}/bin")
     set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${config}
       "${PROJECT_BINARY_DIR}/bin")
   endforeach()
+else()
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
+  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
 endif()
 
 include(CMakeAddFortranSubdirectory)

-----------------------------------------------------------------------

Summary of changes:
 Tests/VSGNUFortran/CMakeLists.txt |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake