mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-24 03:17:49 +08:00
4cbbcbddfd
* [vcpkg ci:osx] Remove brew install * add instructions for creating a new vagrant box * fix the vagrant scripts for the new box * finish fixing the setup * [mecab jxrlib] fix ports for CI mecab needed to use an actual ref that wasn't master, and jxrlib needed a patch for xcode 12 CLTs. Additionally, this fixes the mecab version to be a date, the date of the last commit, since `1.0` is not the correct version (mecab doesn't have released versions) * [many ports] fix compile with Xcode 12 CLTs This mostly means fixing errors on implicit-function-declaration, and removing some Werrors * alac-decoder * apr * argtable2 * arrow * hyperscan * mcpp * minizip * mosquitto * stormlib * [many ports] even more Xcode 12 CLT fixes * [jxrlib darknet] fix the last ports! (hopefully) * CRs, plus minor wip changes to osx scripts
45 lines
1.2 KiB
Diff
45 lines
1.2 KiB
Diff
From 675ba1de6c01b4050ae3cc60916d3f0a72b03105 Mon Sep 17 00:00:00 2001
|
|
From: Nicole Mazzuca <mazzucan@outlook.com>
|
|
Date: Tue, 22 Sep 2020 15:40:55 -0700
|
|
Subject: [PATCH 2/5] win64 support
|
|
|
|
---
|
|
CMakeLists.txt | 7 +------
|
|
config.h | 2 +-
|
|
2 files changed, 2 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index e11959c..1a92fe3 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -57,12 +57,7 @@ option(WITH_THREADING "Include client library threading support?" ON)
|
|
if (WITH_THREADING)
|
|
add_definitions("-DWITH_THREADING")
|
|
if (WIN32)
|
|
- if (CMAKE_CL_64)
|
|
- set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x64\\pthreadVC2.lib)
|
|
- else (CMAKE_CL_64)
|
|
- set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x86\\pthreadVC2.lib)
|
|
- endif (CMAKE_CL_64)
|
|
- set (PTHREAD_INCLUDE_DIR C:\\pthreads\\Pre-built.2\\include)
|
|
+ find_package(pthread REQUIRED)
|
|
else (WIN32)
|
|
find_library(LIBPTHREAD pthread)
|
|
if (LIBPTHREAD)
|
|
diff --git a/config.h b/config.h
|
|
index 5cce39e..c673bf4 100644
|
|
--- a/config.h
|
|
+++ b/config.h
|
|
@@ -31,7 +31,7 @@
|
|
# define EPROTO ECONNABORTED
|
|
#endif
|
|
|
|
-#ifdef WIN32
|
|
+#ifdef _WIN32
|
|
# ifndef strcasecmp
|
|
# define strcasecmp strcmpi
|
|
# endif
|
|
--
|
|
2.24.3 (Apple Git-128)
|
|
|