Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
ac8218a0
Commit
ac8218a0
authored
Mar 31, 2017
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix Ninja builds for AWS SDK
specify BUILD_BYPRODUCTS, ninja needs it
parent
31896aa6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
10 deletions
+13
-10
plugin/aws_key_management/CMakeLists.txt
plugin/aws_key_management/CMakeLists.txt
+13
-10
No files found.
plugin/aws_key_management/CMakeLists.txt
View file @
ac8218a0
...
...
@@ -102,6 +102,17 @@ ELSE()
SET
(
EXTRA_SDK_CMAKE_FLAGS
${
EXTRA_SDK_CMAKE_FLAGS
}
-DCMAKE_CXX_COMPILER=
${
CMAKE_CXX_COMPILER
}
)
ENDIF
()
SET
(
byproducts
)
# We do not need to build the whole SDK , just 2 of its libs
set
(
AWS_SDK_LIBS aws-cpp-sdk-core aws-cpp-sdk-kms
)
FOREACH
(
lib
${
AWS_SDK_LIBS
}
)
ADD_LIBRARY
(
${
lib
}
STATIC IMPORTED GLOBAL
)
ADD_DEPENDENCIES
(
${
lib
}
aws_sdk_cpp
)
SET
(
loc
"
${
CMAKE_CURRENT_BINARY_DIR
}
/aws_sdk_cpp/lib/
${
CMAKE_STATIC_LIBRARY_PREFIX
}${
lib
}${
CMAKE_STATIC_LIBRARY_SUFFIX
}
"
)
SET
(
byproducts
${
byproducts
}
BUILD_BYPRODUCTS
${
loc
}
)
SET_TARGET_PROPERTIES
(
${
lib
}
PROPERTIES IMPORTED_LOCATION
${
loc
}
)
ENDFOREACH
()
SET
(
AWS_SDK_PATCH_COMMAND
)
ExternalProject_Add
(
aws_sdk_cpp
...
...
@@ -109,7 +120,8 @@ ELSE()
GIT_TAG
"1.0.8"
UPDATE_COMMAND
""
SOURCE_DIR
"
${
CMAKE_CURRENT_BINARY_DIR
}
/aws-sdk-cpp"
CMAKE_ARGS
${
byproducts
}
CMAKE_ARGS
-DBUILD_ONLY=kms
-DBUILD_SHARED_LIBS=OFF
-DFORCE_SHARED_CRT=OFF
...
...
@@ -122,14 +134,6 @@ ELSE()
TEST_COMMAND
""
)
SET_TARGET_PROPERTIES
(
aws_sdk_cpp PROPERTIES EXCLUDE_FROM_ALL TRUE
)
# We do not need to build the whole SDK , just 2 of its libs
set
(
AWS_SDK_LIBS aws-cpp-sdk-core aws-cpp-sdk-kms
)
FOREACH
(
lib
${
AWS_SDK_LIBS
}
)
ADD_LIBRARY
(
${
lib
}
STATIC IMPORTED GLOBAL
)
ADD_DEPENDENCIES
(
${
lib
}
aws_sdk_cpp
)
SET
(
loc
"
${
CMAKE_CURRENT_BINARY_DIR
}
/aws_sdk_cpp/lib/
${
CMAKE_STATIC_LIBRARY_PREFIX
}${
lib
}${
CMAKE_STATIC_LIBRARY_SUFFIX
}
"
)
SET_TARGET_PROPERTIES
(
${
lib
}
PROPERTIES IMPORTED_LOCATION
${
loc
}
)
ENDFOREACH
()
IF
(
CMAKE_SYSTEM_NAME MATCHES
"Linux"
)
# Need whole-archive , otherwise static libraries are not linked
...
...
@@ -149,4 +153,3 @@ ELSE()
ENDIF
()
TARGET_LINK_LIBRARIES
(
aws_key_management
${
AWS_SDK_LIBS
}
${
AWS_CPP_SDK_DEPENDENCIES
}
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment