CMake: MSVC++ no longer uses a special configuration method.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@58132 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
index 6cd88da..58db002 100755
--- a/cmake/config-ix.cmake
+++ b/cmake/config-ix.cmake
@@ -23,6 +23,7 @@
check_include_file(stdint.h HAVE_STDINT_H)
check_include_file(stdio.h HAVE_STDIO_H)
check_include_file(stdlib.h HAVE_STDLIB_H)
+check_include_file(string.h HAVE_STRING_H)
check_include_file(sys/dir.h HAVE_SYS_DIR_H)
check_include_file(sys/dl.h HAVE_SYS_DL_H)
check_include_file(sys/mman.h HAVE_SYS_MMAN_H)
@@ -34,6 +35,7 @@
check_include_file(sys/types.h HAVE_SYS_TYPES_H)
check_include_file(unistd.h HAVE_UNISTD_H)
check_include_file(utime.h HAVE_UTIME_H)
+check_include_file(windows.h HAVE_WINDOWS_H)
# function checks
include(CheckSymbolExists)
@@ -44,8 +46,11 @@
check_symbol_exists(isinf math.h HAVE_ISINF_IN_MATH_H)
check_symbol_exists(isnan cmath HAVE_ISNAN_IN_CMATH)
check_symbol_exists(isnan math.h HAVE_ISNAN_IN_MATH_H)
+check_symbol_exists(ceilf math.h HAVE_CEILF)
+check_symbol_exists(floorf math.h HAVE_FLOORF)
check_symbol_exists(mallinfo malloc.h HAVE_MALLINFO)
check_symbol_exists(pthread_mutex_lock pthread.h HAVE_PTHREAD_MUTEX_LOCK)
+check_symbol_exists(strtoll stdlib.h HAVE_STRTOLL)
if( MINGW )
# tbi: Comprobar que existen las librerias:
@@ -55,11 +60,31 @@
# CHECK_LIBRARY_EXISTS(imagehlp ??? . HAVE_LIBIMAGEHLP)
endif( MINGW )
-# Classes
-include(CheckCxxHashmap)
-include(CheckCxxHashset)
-check_hashmap()
-check_hashset()
+if( MSVC )
+ set(error_t int)
+ set(LTDL_SHLIBPATH_VAR "PATH")
+ set(LTDL_SYSSEARCHPATH "")
+ set(LTDL_DLOPEN_DEPLIBS 1)
+ set(SHLIBEXT ".lib")
+ set(LTDL_OBJDIR "_libs")
+ set(HAVE_STRTOLL 1)
+ set(strtoll "_strtoi64")
+ set(strtoull "_strtoui64")
+ set(stricmp "_stricmp")
+ set(strdup "_strdup")
+else( MSVC )
+ set(LTDL_SHLIBPATH_VAR "LD_LIBRARY_PATH")
+ set(LTDL_SYSSEARCHPATH "") # TODO
+ set(LTDL_DLOPEN_DEPLIBS 0) # TODO
+endif( MSVC )
+
+if( NOT MSVC )
+ # hash_map.h.in and hash_set.h.in contain a special case for MSVC
+ include(CheckCxxHashmap)
+ include(CheckCxxHashset)
+ check_hashmap()
+ check_hashset()
+endif( NOT MSVC )
# FIXME: Signal handler return type, currently hardcoded to 'void'
set(RETSIGTYPE void)