mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-12 02:19:03 +08:00
45 lines
1.2 KiB
Diff
45 lines
1.2 KiB
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 44842d3..e34ab24 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -452,7 +452,7 @@ ELSE()
|
||
|
|
SET(DEFAULT_TMPDIR "\"${TMPDIR}\"")
|
||
|
|
ENDIF()
|
||
|
|
|
||
|
|
-INCLUDE(cmake/boost.cmake)
|
||
|
|
+#INCLUDE(cmake/boost.cmake)
|
||
|
|
|
||
|
|
IF (CMAKE_SYSTEM_NAME MATCHES "Linux")
|
||
|
|
OPTION(WITH_SYSTEMD "Enable installation of systemd support files" OFF)
|
||
|
|
diff --git a/client/dump/CMakeLists.txt b/client/dump/CMakeLists.txt
|
||
|
|
index bae2ce7..4e11516 100644
|
||
|
|
--- a/client/dump/CMakeLists.txt
|
||
|
|
+++ b/client/dump/CMakeLists.txt
|
||
|
|
@@ -21,12 +21,12 @@ INCLUDE_DIRECTORIES(
|
||
|
|
${CMAKE_SOURCE_DIR}/dump
|
||
|
|
)
|
||
|
|
|
||
|
|
-IF (CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
|
||
|
|
+#IF (CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
|
||
|
|
IF (WITHOUT_SERVER)
|
||
|
|
MESSAGE(STATUS "Not building mysqlpump")
|
||
|
|
RETURN()
|
||
|
|
ENDIF()
|
||
|
|
-ENDIF()
|
||
|
|
+#ENDIF()
|
||
|
|
|
||
|
|
# Prevent Boost from including external precompiled Boost libraries, use
|
||
|
|
# threading (not implemented for older Solaris Studio compilers)
|
||
|
|
diff --git a/mysys/mysys_priv.h b/mysys/mysys_priv.h
|
||
|
|
index 8b7a554..4353037 100644
|
||
|
|
--- a/mysys/mysys_priv.h
|
||
|
|
+++ b/mysys/mysys_priv.h
|
||
|
|
@@ -18,6 +18,7 @@
|
||
|
|
|
||
|
|
#include "my_global.h"
|
||
|
|
#include "mysql/psi/mysql_thread.h"
|
||
|
|
+#include "my_sys.h"
|
||
|
|
|
||
|
|
#ifdef HAVE_PSI_INTERFACE
|
||
|
|
|