diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-05 13:07:16 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-05 09:07:25 -0400 |
| commit | d3d53eefeeea5d3cf853f4591e318f3e4998bec0 (patch) | |
| tree | 38978061ee03daec77fcc7690673114ef115451b /Tests | |
| parent | 6a5daced189241b6dca9ee43de9f60d826f4c568 (diff) | |
| parent | be75622e49614fcb96e99316f7a6e8a438538e7f (diff) | |
| download | cmake-d3d53eefeeea5d3cf853f4591e318f3e4998bec0.tar.gz | |
Merge topic 'remove_cli__symbols'
be75622e49 bindexplib: Do not export symbols from managed code
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4692
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/AutoExportDll/AutoExport.cmake | 6 | ||||
| -rw-r--r-- | Tests/RunCMake/AutoExportDll/cppCLI.cxx | 22 | ||||
| -rw-r--r-- | Tests/RunCMake/AutoExportDll/say.cxx | 8 |
3 files changed, 34 insertions, 2 deletions
diff --git a/Tests/RunCMake/AutoExportDll/AutoExport.cmake b/Tests/RunCMake/AutoExportDll/AutoExport.cmake index a5500052bd..85eff7ead7 100644 --- a/Tests/RunCMake/AutoExportDll/AutoExport.cmake +++ b/Tests/RunCMake/AutoExportDll/AutoExport.cmake @@ -5,6 +5,10 @@ add_subdirectory(sub) add_library(objlib OBJECT objlib.c) set_property(TARGET objlib PROPERTY POSITION_INDEPENDENT_CODE 1) add_library(autoexport SHARED hello.cxx world.cxx foo.c $<TARGET_OBJECTS:objlib>) +add_library(autoexport3 SHARED cppCLI.cxx) +if(MSVC AND NOT MSVC_VERSION VERSION_LESS 1600) + set_property(TARGET autoexport3 PROPERTY COMMON_LANGUAGE_RUNTIME "") +endif() add_executable(say say.cxx) if(MSVC) @@ -18,4 +22,4 @@ if(MSVC) target_compile_definitions(say PRIVATE HAS_JUSTNOP) endif() endif() -target_link_libraries(say autoexport autoexport2) +target_link_libraries(say autoexport autoexport2 autoexport3) diff --git a/Tests/RunCMake/AutoExportDll/cppCLI.cxx b/Tests/RunCMake/AutoExportDll/cppCLI.cxx new file mode 100644 index 0000000000..816bb6e89b --- /dev/null +++ b/Tests/RunCMake/AutoExportDll/cppCLI.cxx @@ -0,0 +1,22 @@ +#include <stdio.h> + +#ifdef __cplusplus_cli +# include <msclr\marshal_cppstd.h> + +void cliFunction() +{ + System::String ^ result = "cliFunction"; + result = result->Trim(); + printf(msclr::interop::marshal_as<std::string>(result).c_str()); +} +#else +void cliFunction() +{ + printf("cliFunction (but /cli was not passed to the compiler)"); +} +#endif + +void nonCliFunction() +{ + printf("nonCliFunction"); +} diff --git a/Tests/RunCMake/AutoExportDll/say.cxx b/Tests/RunCMake/AutoExportDll/say.cxx index 654b5e03d2..8fc768a368 100644 --- a/Tests/RunCMake/AutoExportDll/say.cxx +++ b/Tests/RunCMake/AutoExportDll/say.cxx @@ -17,9 +17,11 @@ void justnop(); } // test c++ functions -// forward declare hello and world +// forward declare hello, world, cliFunction and nonCliFunction void hello(); void world(); +void cliFunction(); +void nonCliFunction(); // test exports for executable target extern "C" { @@ -44,6 +46,10 @@ int main() bar(); objlib(); printf("\n"); + cliFunction(); + printf("\n"); + nonCliFunction(); + printf("\n"); #ifdef HAS_JUSTNOP justnop(); #endif |