瀏覽代碼

Merge topic 'mingw-module-definition'

6a61a8a Honor module .def files with MinGW tools (#9997)
Brad King 14 年之前
父節點
當前提交
521d244531
共有 2 個文件被更改,包括 5 次插入1 次删除
  1. 1 0
      Modules/Platform/Windows-GNU.cmake
  2. 4 1
      Tests/CMakeLists.txt

+ 1 - 0
Modules/Platform/Windows-GNU.cmake

@@ -43,6 +43,7 @@ endif()
 set(CMAKE_DL_LIBS "")
 set(CMAKE_LIBRARY_PATH_FLAG "-L")
 set(CMAKE_LINK_LIBRARY_FLAG "-l")
+set(CMAKE_LINK_DEF_FILE_FLAG "-Wl,")
 set(CMAKE_LINK_LIBRARY_SUFFIX "")
 set(CMAKE_CREATE_WIN32_EXE  "-mwindows")
 

+ 4 - 1
Tests/CMakeLists.txt

@@ -1079,8 +1079,11 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
   IF(CMAKE_TEST_MSVC)
     ADD_TEST_MACRO(ForceInclude foo)
     ADD_TEST_MACRO(PrecompiledHeader foo)
+  ENDIF()
+  IF(CMAKE_TEST_MSVC OR
+      "${CMAKE_TEST_GENERATOR}" MATCHES "(MSYS|MinGW) Makefiles")
     ADD_TEST_MACRO(ModuleDefinition example_exe)
-  ENDIF(CMAKE_TEST_MSVC)
+  ENDIF()
 
   ADD_TEST_MACRO(CheckCompilerRelatedVariables CheckCompilerRelatedVariables)