diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2006-12-08 20:52:30 (GMT) |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2006-12-08 20:52:30 (GMT) |
| commit | 458fa7559be7f0f2376262897cfae866e25a08d5 (patch) | |
| tree | fa98b76f6607336c906e4f86b2883cfdaeab9faa /Source/kwsys | |
| parent | 1dd5db023592c3c5488adb67dfba433ab5b399af (diff) | |
| download | CMake-458fa7559be7f0f2376262897cfae866e25a08d5.zip CMake-458fa7559be7f0f2376262897cfae866e25a08d5.tar.gz CMake-458fa7559be7f0f2376262897cfae866e25a08d5.tar.bz2 | |
BUG: Make sure to use the Win32 interface (HINSTANCE) for handling shared lib on cygwin and mingw system
Diffstat (limited to 'Source/kwsys')
| -rw-r--r-- | Source/kwsys/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Source/kwsys/DynamicLoader.cxx | 2 | ||||
| -rw-r--r-- | Source/kwsys/DynamicLoader.hxx.in | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt index b3febd2..69b536b 100644 --- a/Source/kwsys/CMakeLists.txt +++ b/Source/kwsys/CMakeLists.txt @@ -718,7 +718,9 @@ IF(KWSYS_C_SRCS OR KWSYS_CXX_SRCS) ${KWSYS_C_SRCS} ${KWSYS_CXX_SRCS}) IF(KWSYS_USE_DynamicLoader) IF(UNIX) - TARGET_LINK_LIBRARIES(${KWSYS_NAMESPACE} ${CMAKE_DL_LIBS}) + IF(NOT CYGWIN AND NOT MINGW) + TARGET_LINK_LIBRARIES(${KWSYS_NAMESPACE} ${CMAKE_DL_LIBS}) + ENDIF(NOT CYGWIN AND NOT MINGW) ENDIF(UNIX) ENDIF(KWSYS_USE_DynamicLoader) diff --git a/Source/kwsys/DynamicLoader.cxx b/Source/kwsys/DynamicLoader.cxx index 87f957f..4b73322 100644 --- a/Source/kwsys/DynamicLoader.cxx +++ b/Source/kwsys/DynamicLoader.cxx @@ -220,7 +220,7 @@ const char* DynamicLoader::LastError() // --------------------------------------------------------------- // 3. Implementation for Windows win32 code -#ifdef _WIN32 +#if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) #include <windows.h> #define DYNAMICLOADER_DEFINED 1 diff --git a/Source/kwsys/DynamicLoader.hxx.in b/Source/kwsys/DynamicLoader.hxx.in index 72dea57..75177cc 100644 --- a/Source/kwsys/DynamicLoader.hxx.in +++ b/Source/kwsys/DynamicLoader.hxx.in @@ -18,7 +18,7 @@ #if defined(__hpux) #include <dl.h> -#elif defined(_WIN32) +#elif defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) #include <windows.h> #elif defined(__APPLE__) #include <AvailabilityMacros.h> @@ -56,7 +56,7 @@ public: // They are different on several different OS's #if defined(__hpux) typedef shl_t LibraryHandle; -#elif defined(_WIN32) +#elif defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) typedef HMODULE LibraryHandle; #elif defined(__APPLE__) #if MAC_OS_X_VERSION_MAX_ALLOWED < 1030 |