kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'mingw-module-definition'

Browse Source 
6a61a8a Honor module .def files with MinGW tools (#9997)
This commit is contained in:
Brad King 2011-02-22 14:33:04 -05:00 committed by CMake Topic Stage
commit 521d244531
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Modules/Platform/Windows-GNU.cmake
View File

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

5
Tests/CMakeLists.txt
View File

@ -1079,8 +1079,11 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
IF(CMAKE_TEST_MSVC) IF(CMAKE_TEST_MSVC)
ADD_TEST_MACRO(ForceInclude foo) ADD_TEST_MACRO(ForceInclude foo)
ADD_TEST_MACRO(PrecompiledHeader 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) ADD_TEST_MACRO(ModuleDefinition example_exe)
ENDIF(CMAKE_TEST_MSVC) ENDIF()
ADD_TEST_MACRO(CheckCompilerRelatedVariables CheckCompilerRelatedVariables) ADD_TEST_MACRO(CheckCompilerRelatedVariables CheckCompilerRelatedVariables)