blob: f26b27417c18eed88e92858f64df376fe4aaf80c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
|
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -454,10 +454,9 @@ endmacro()
SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin")
SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib")
-SET(LIB_SUBDIR "lib")
-IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|ppc64|ppc64p7|s390x|sparc64|aarch64)")
- SET(LIB_SUBDIR "lib64")
-ENDIF()
+IF(NOT LIB_SUBDIR)
+ MESSAGE(ERROR "LIB_SUBDIR is not set")
+ENDIF(NOT LIB_SUBDIR)
MESSAGE(STATUS "Installation library subdir: ${LIB_SUBDIR}")
--- a/cmake/FindMySQL.cmake
+++ b/cmake/FindMySQL.cmake
@@ -805,7 +805,7 @@ if(NOT WIN32)
endif()
if(NOT MYSQL_CXXFLAGS)
- if(MYSQL_CXX_LINKAGE OR MYSQL_VERSION_ID GREATER 50603)
+ if(MYSQL_CXX_LINKAGE)
_mysql_conf(MYSQL_CXXFLAGS "--cxxflags")
set(MYSQL_CXX_LINKAGE 1)
else()
|
