mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-07 22:59:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'win32-executable-genex'

Browse Source 
3ef0c40962 WIN32_EXECUTABLE: Add support for generator expressions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5146
This commit is contained in:
Brad King
2020-08-25 14:31:44 +00:00
committed by Kitware Robot
parent ea67dbc4cd 3ef0c40962
commit f035ddec4f
20 changed files with 118 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/CMakeLists.txt
+4
View File
@@ -440,6 +440,10 @@ if(BUILD_TESTING)
ADD_TEST_MACRO(CSharpOnly CSharpOnly)
ADD_TEST_MACRO(CSharpLinkToCxx CSharpLinkToCxx)
ADD_TEST_MACRO(CSharpLinkFromCxx CSharpLinkFromCxx)
ADD_TEST_MACRO(CSharpWin32GenEx CSharpWin32GenEx)
set_tests_properties(CSharpWin32GenEx PROPERTIES
PASS_REGULAR_EXPRESSION "Target \"CSharpWin32GenEx\" has a generator expression in its\n WIN32_EXECUTABLE property\\. This is not supported on managed executables\\."
)
endif()
ADD_TEST_MACRO(COnly COnly)
Tests/CSharpWin32GenEx/CMakeLists.txt
+5
View File
@@ -0,0 +1,5 @@
cmake_minimum_required(VERSION 3.18)
project(CSharpWin32GenEx CSharp)
add_executable(CSharpWin32GenEx csharpwin32genex.cs)
set_property(TARGET CSharpWin32GenEx PROPERTY WIN32_EXECUTABLE $<1:1>)
Tests/CSharpWin32GenEx/csharpwin32genex.cs
+9
View File
@@ -0,0 +1,9 @@
namespace CSharpWin32GenEx
{
class CSharpWin32GenEx
{
public static void Main(string[] args)
{
}
}
}
Tests/RunCMake/CMakeLists.txt
+4
View File
@@ -733,3 +733,7 @@ add_RunCMake_test("CTestCommandExpandLists")
add_RunCMake_test(PrecompileHeaders -DCMAKE_C_COMPILER_ID=${CMAKE_C_COMPILER_ID})
add_RunCMake_test("UnityBuild")
if(WIN32)
add_RunCMake_test(Win32GenEx)
endif()
Tests/RunCMake/Win32GenEx/CMakeLists.txt
+3
View File
@@ -0,0 +1,3 @@
cmake_minimum_required(VERSION 3.18)
project(${RunCMake_TEST} NONE)
include(${RunCMake_TEST}.cmake)
Tests/RunCMake/Win32GenEx/RunCMakeTest.cmake
+28
View File
@@ -0,0 +1,28 @@
include(RunCMake)
if(RunCMake_GENERATOR_IS_MULTI_CONFIG)
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/Win32GenEx-build)
run_cmake(Win32GenEx)
set(RunCMake_TEST_NO_CLEAN 1)
run_cmake_command(Win32GenEx-debug-build ${CMAKE_COMMAND} --build ${RunCMake_TEST_BINARY_DIR} --config Debug)
run_cmake_command(Win32GenEx-release-build ${CMAKE_COMMAND} --build ${RunCMake_TEST_BINARY_DIR} --config Release)
unset(RunCMake_TEST_NO_CLEAN)
else()
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/Win32GenEx-debug-build)
set(RunCMake_TEST_OPTIONS -DCMAKE_BUILD_TYPE=Debug)
run_cmake(Win32GenEx-debug)
unset(RunCMake_TEST_OPTIONS)
set(RunCMake_TEST_NO_CLEAN 1)
run_cmake_command(Win32GenEx-debug-build ${CMAKE_COMMAND} --build ${RunCMake_TEST_BINARY_DIR})
unset(RunCMake_TEST_NO_CLEAN)
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/Win32GenEx-release-build)
set(RunCMake_TEST_OPTIONS -DCMAKE_BUILD_TYPE=Release)
run_cmake(Win32GenEx-release)
unset(RunCMake_TEST_OPTIONS)
set(RunCMake_TEST_NO_CLEAN 1)
run_cmake_command(Win32GenEx-release-build ${CMAKE_COMMAND} --build ${RunCMake_TEST_BINARY_DIR})
unset(RunCMake_TEST_NO_CLEAN)
endif()
Tests/RunCMake/Win32GenEx/Win32GenEx-debug.cmake
+1
View File
@@ -0,0 +1 @@
include(Win32GenEx.cmake)
Tests/RunCMake/Win32GenEx/Win32GenEx-release.cmake
+1
View File
@@ -0,0 +1 @@
include(Win32GenEx.cmake)
Tests/RunCMake/Win32GenEx/Win32GenEx.cmake
+7
View File
@@ -0,0 +1,7 @@
enable_language(C)
add_executable(Win32GenEx main.c)
set_target_properties(Win32GenEx PROPERTIES
WIN32_EXECUTABLE $<CONFIG:Release>
)
target_compile_definitions(Win32GenEx PRIVATE $<$<CONFIG:Release>:USE_WIN32_MAIN>)
Tests/RunCMake/Win32GenEx/main.c
+14
View File
@@ -0,0 +1,14 @@
#ifdef USE_WIN32_MAIN
# include <windows.h>
int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
LPSTR lpCmdLine, int nShowCmd)
{
return 0;
}
#else
int main(void)
{
return 0;
}
#endif