[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-703-g89b6247

[Brad King]

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  89b62475deb926de0abac3130d02a1b3d6fe219b (commit)
       via  806609c7024dbf07a639a9d77074d4bc82ae1b8a (commit)
      from  5d6f4b8df932f684ab590174993c046d5659e399 (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=89b62475deb926de0abac3130d02a1b3d6fe219b
commit 89b62475deb926de0abac3130d02a1b3d6fe219b
Merge: 5d6f4b8 806609c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 26 10:08:46 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 26 10:08:46 2015 -0400

    Merge topic 'vs-librarian-machine-flag-default' into next
    
    806609c7 VS: Add /machine: flag to Librarian tool (#11240)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=806609c7024dbf07a639a9d77074d4bc82ae1b8a
commit 806609c7024dbf07a639a9d77074d4bc82ae1b8a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 26 09:38:35 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jun 26 10:07:08 2015 -0400

    VS: Add /machine: flag to Librarian tool (#11240)
    
    If a Windows resource (.rc) source file is included in a STATIC library,
    the VS "link" tool will process the compiled ".res" file and needs to know
    the target architecture.  Without it, we may get a LNK4068 warning and
    possibly a LNK1112 error.  Add /machine: to the default static library
    flags to give the link tool the information it needs.

diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 13fe8bc..2537e39 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -230,6 +230,7 @@ elseif(MSVC_Fortran_ARCHITECTURE_ID)
   set(_MACHINE_ARCH_FLAG "/machine:${MSVC_Fortran_ARCHITECTURE_ID}")
 endif()
 set(CMAKE_EXE_LINKER_FLAGS_INIT "${CMAKE_EXE_LINKER_FLAGS_INIT} ${_MACHINE_ARCH_FLAG}")
+set(CMAKE_STATIC_LINKER_FLAGS_INIT "${CMAKE_STATIC_LINKER_FLAGS_INIT} ${_MACHINE_ARCH_FLAG}")
 unset(_MACHINE_ARCH_FLAG)
 
 # add /debug and /INCREMENTAL:YES to DEBUG and RELWITHDEBINFO also add pdbtype
diff --git a/Tests/VSResource/CMakeLists.txt b/Tests/VSResource/CMakeLists.txt
index 17eb041..3b9cfc3 100644
--- a/Tests/VSResource/CMakeLists.txt
+++ b/Tests/VSResource/CMakeLists.txt
@@ -46,7 +46,10 @@ else()
   include_directories(${CMAKE_CURRENT_BINARY_DIR})
 endif()
 
+add_library(ResourceLib STATIC lib.cpp lib.rc)
+
 add_executable(VSResource main.cpp test.rc)
+target_link_libraries(VSResource ResourceLib)
 
 set_property(TARGET VSResource
   PROPERTY VS_GLOBAL_CMakeTestVsGlobalVariable "test val")
diff --git a/Tests/VSResource/lib.cpp b/Tests/VSResource/lib.cpp
new file mode 100644
index 0000000..006e3e4
--- /dev/null
+++ b/Tests/VSResource/lib.cpp
@@ -0,0 +1 @@
+int lib() { return 0; }
diff --git a/Tests/VSResource/lib.rc b/Tests/VSResource/lib.rc
new file mode 100644
index 0000000..1ffade6
--- /dev/null
+++ b/Tests/VSResource/lib.rc
@@ -0,0 +1,4 @@
+STRINGTABLE
+BEGIN
+  1234 "5"
+END
diff --git a/Tests/VSResource/main.cpp b/Tests/VSResource/main.cpp
index 7ee0c74..ccf700c 100644
--- a/Tests/VSResource/main.cpp
+++ b/Tests/VSResource/main.cpp
@@ -1,6 +1,8 @@
 #include <windows.h>
 #include <stdio.h>
 
+extern int lib();
+
 struct x
 {
   const char *txt;
@@ -76,5 +78,5 @@ int main(int argc, char** argv)
       }
     }
 
-  return ret;
+  return ret + lib();
 }

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

Summary of changes:


hooks/post-receive
-- 
CMake