diff options
| author | Brad King <brad.king@kitware.com> | 2012-04-02 15:00:42 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-04-02 15:00:42 (GMT) |
| commit | 3fd0dde23ea692419fe2399cc6e0c4ee089c2ae3 (patch) | |
| tree | e6b392b73d150193059e15e779026f7189aea316 | |
| parent | d2c764ad8db1a2d920e43f5c78d4ff4b1f643cee (diff) | |
| parent | 89987c21027af53a97db07babf91d718e52676c3 (diff) | |
| download | CMake-3fd0dde23ea692419fe2399cc6e0c4ee089c2ae3.zip CMake-3fd0dde23ea692419fe2399cc6e0c4ee089c2ae3.tar.gz CMake-3fd0dde23ea692419fe2399cc6e0c4ee089c2ae3.tar.bz2 | |
Merge branch 'test-generated-def' into ninja-generated-def
| -rw-r--r-- | Tests/ModuleDefinition/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | Tests/ModuleDefinition/example_dll_gen.c | 1 | ||||
| -rw-r--r-- | Tests/ModuleDefinition/example_dll_gen.def.in | 2 | ||||
| -rw-r--r-- | Tests/ModuleDefinition/example_exe.c | 2 |
4 files changed, 14 insertions, 1 deletions
diff --git a/Tests/ModuleDefinition/CMakeLists.txt b/Tests/ModuleDefinition/CMakeLists.txt index b463a3c..a30f643 100644 --- a/Tests/ModuleDefinition/CMakeLists.txt +++ b/Tests/ModuleDefinition/CMakeLists.txt @@ -4,6 +4,14 @@ project(ModuleDefinition C) # Test .def file source recognition for DLLs. add_library(example_dll SHARED example_dll.c example_dll.def) +# Test generated .def file. +add_custom_command(OUTPUT example_dll_gen.def + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/example_dll_gen.def.in + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/example_dll_gen.def.in + ${CMAKE_CURRENT_BINARY_DIR}/example_dll_gen.def + ) +add_library(example_dll_gen SHARED example_dll_gen.c example_dll_gen.def) + # Test /DEF:<file> flag recognition for VS. if(MSVC OR "${CMAKE_C_COMPILER_ID}" MATCHES "^(Intel)$") add_library(example_dll_2 SHARED example_dll_2.c) @@ -16,7 +24,7 @@ endif() # Test .def file source recognition for EXEs. add_executable(example_exe example_exe.c example_exe.def) set_property(TARGET example_exe PROPERTY ENABLE_EXPORTS 1) -target_link_libraries(example_exe example_dll ${example_dll_2}) +target_link_libraries(example_exe example_dll example_dll_gen ${example_dll_2}) # Test linking to the executable. add_library(example_mod_1 MODULE example_mod_1.c) diff --git a/Tests/ModuleDefinition/example_dll_gen.c b/Tests/ModuleDefinition/example_dll_gen.c new file mode 100644 index 0000000..be5d1ee --- /dev/null +++ b/Tests/ModuleDefinition/example_dll_gen.c @@ -0,0 +1 @@ +int example_dll_gen_function(void) { return 0; } diff --git a/Tests/ModuleDefinition/example_dll_gen.def.in b/Tests/ModuleDefinition/example_dll_gen.def.in new file mode 100644 index 0000000..c489dbc --- /dev/null +++ b/Tests/ModuleDefinition/example_dll_gen.def.in @@ -0,0 +1,2 @@ +EXPORTS +example_dll_gen_function diff --git a/Tests/ModuleDefinition/example_exe.c b/Tests/ModuleDefinition/example_exe.c index c521b3a..253ae8b 100644 --- a/Tests/ModuleDefinition/example_exe.c +++ b/Tests/ModuleDefinition/example_exe.c @@ -1,4 +1,5 @@ extern int __declspec(dllimport) example_dll_function(void); +extern int __declspec(dllimport) example_dll_gen_function(void); #ifdef EXAMPLE_DLL_2 extern int __declspec(dllimport) example_dll_2_function(void); #endif @@ -7,6 +8,7 @@ int main(void) { return example_dll_function() + + example_dll_gen_function() + #ifdef EXAMPLE_DLL_2 example_dll_2_function() + #endif |