diff options
| author | Brad King <brad.king@kitware.com> | 2009-10-05 18:39:23 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2009-10-05 18:39:23 (GMT) |
| commit | f1b7e620f7fa867ee50eb50ad398d349281691fe (patch) | |
| tree | 9aae3f9e305e838a034d52a95e1fe43fdecdf569 | |
| parent | 667f0724a87ea5fa5f71c475f7588a9deab75ebb (diff) | |
| download | CMake-f1b7e620f7fa867ee50eb50ad398d349281691fe.zip CMake-f1b7e620f7fa867ee50eb50ad398d349281691fe.tar.gz CMake-f1b7e620f7fa867ee50eb50ad398d349281691fe.tar.bz2 | |
Fix ModuleDefinition test for Intel on Windows
CMake defines MSVC only for a VS compiler, but the Intel compiler adds
the preprocessor definition _MSC_VER. Instead of relying on separate
tests to decide whether to use example_dll_2, we do one test in CMake
and then add our own preprocessor definition.
| -rw-r--r-- | Tests/ModuleDefinition/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/ModuleDefinition/example_exe.c | 4 | ||||
| -rw-r--r-- | Tests/ModuleDefinition/example_mod_1.c | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/Tests/ModuleDefinition/CMakeLists.txt b/Tests/ModuleDefinition/CMakeLists.txt index 0cef0c7..b463a3c 100644 --- a/Tests/ModuleDefinition/CMakeLists.txt +++ b/Tests/ModuleDefinition/CMakeLists.txt @@ -5,10 +5,11 @@ project(ModuleDefinition C) add_library(example_dll SHARED example_dll.c example_dll.def) # Test /DEF:<file> flag recognition for VS. -if(MSVC) +if(MSVC OR "${CMAKE_C_COMPILER_ID}" MATCHES "^(Intel)$") add_library(example_dll_2 SHARED example_dll_2.c) set_property(TARGET example_dll_2 PROPERTY LINK_FLAGS /DEF:"${ModuleDefinition_SOURCE_DIR}/example_dll_2.def") + set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS EXAMPLE_DLL_2) set(example_dll_2 example_dll_2) endif() diff --git a/Tests/ModuleDefinition/example_exe.c b/Tests/ModuleDefinition/example_exe.c index 60cde6a..c521b3a 100644 --- a/Tests/ModuleDefinition/example_exe.c +++ b/Tests/ModuleDefinition/example_exe.c @@ -1,5 +1,5 @@ extern int __declspec(dllimport) example_dll_function(void); -#ifdef _MSC_VER +#ifdef EXAMPLE_DLL_2 extern int __declspec(dllimport) example_dll_2_function(void); #endif int example_exe_function(void) { return 0; } @@ -7,7 +7,7 @@ int main(void) { return example_dll_function() + -#ifdef _MSC_VER +#ifdef EXAMPLE_DLL_2 example_dll_2_function() + #endif example_exe_function(); diff --git a/Tests/ModuleDefinition/example_mod_1.c b/Tests/ModuleDefinition/example_mod_1.c index 483f60e..4e2f9ba 100644 --- a/Tests/ModuleDefinition/example_mod_1.c +++ b/Tests/ModuleDefinition/example_mod_1.c @@ -6,7 +6,7 @@ int __declspec(dllimport) example_exe_function(void); int __declspec(dllimport) example_dll_function(void); -#ifdef _MSC_VER +#ifdef EXAMPLE_DLL_2 int __declspec(dllimport) example_dll_2_function(void); #endif @@ -14,7 +14,7 @@ __declspec(dllexport) int MODULE_CCONV example_mod_1_function(int n) { return example_dll_function() + -#ifdef _MSC_VER +#ifdef EXAMPLE_DLL_2 example_dll_2_function() + #endif example_exe_function() + n; |