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

Merge topic 'fix-windows-version-detection' 

17009189 Windows: Fix CMAKE_HOST_SYSTEM_VERSION on Windows >= 8 (#15674)
This commit is contained in:
Brad King 2015-09-22 10:46:54 -04:00 committed by CMake Topic Stage
parent dce7d8befb 17009189f8
commit f1365f3206
3 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/CMakeLists.txt
View File

@ -502,6 +502,10 @@ if (WIN32)
cmGhsMultiGpj.cxx cmGhsMultiGpj.cxx
cmGhsMultiGpj.h cmGhsMultiGpj.h
) )
# Add a manifest file to executables on Windows to allow for
# GetVersion to work properly on Windows 8 and above.
set(MANIFEST_FILE ${CMAKE_CURRENT_SOURCE_DIR}/cmake.version.manifest)
endif() endif()
endif () endif ()
@ -531,7 +535,7 @@ set(SRCS ${SRCS}
if(WIN32 AND NOT CYGWIN) if(WIN32 AND NOT CYGWIN)
set_source_files_properties(cmcldeps.cxx PROPERTIES COMPILE_DEFINITIONS _WIN32_WINNT=0x0501) set_source_files_properties(cmcldeps.cxx PROPERTIES COMPILE_DEFINITIONS _WIN32_WINNT=0x0501)
add_executable(cmcldeps cmcldeps.cxx) add_executable(cmcldeps cmcldeps.cxx ${MANIFEST_FILE})
target_link_libraries(cmcldeps CMakeLib) target_link_libraries(cmcldeps CMakeLib)
install(TARGETS cmcldeps DESTINATION bin) install(TARGETS cmcldeps DESTINATION bin)
endif() endif()
@ -720,15 +724,15 @@ if(APPLE)
endif() endif()
# Build CMake executable # Build CMake executable
add_executable(cmake cmakemain.cxx cmcmd.cxx cmcmd.h) add_executable(cmake cmakemain.cxx cmcmd.cxx cmcmd.h ${MANIFEST_FILE})
target_link_libraries(cmake CMakeLib) target_link_libraries(cmake CMakeLib)
# Build CTest executable # Build CTest executable
add_executable(ctest ctest.cxx) add_executable(ctest ctest.cxx ${MANIFEST_FILE})
target_link_libraries(ctest CTestLib) target_link_libraries(ctest CTestLib)
# Build CPack executable # Build CPack executable
add_executable(cpack CPack/cpack.cxx) add_executable(cpack CPack/cpack.cxx ${MANIFEST_FILE})
target_link_libraries(cpack CPackLib) target_link_libraries(cpack CPackLib)
# Curses GUI # Curses GUI

2
Source/QtDialog/CMakeLists.txt
View File

@ -152,7 +152,7 @@ endif()
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS}) add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS} ${MANIFEST_FILE})
target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES}) target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
if(APPLE) if(APPLE)

18
Source/cmake.version.manifest Normal file
View File

@ -0,0 +1,18 @@
<assembly xmlns="urn:schemas-microsoft-com:asm.v1"
manifestVersion="1.0"
xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" >
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!-- Windows Vista -->
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
<!-- Windows 7 -->
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
<!-- Windows 8 -->
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
<!-- Windows 8.1 -->
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
<!-- Windows 10 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
</application>
</compatibility>
</assembly>