Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
tarantool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
core
tarantool
Commits
f1b7f13a
Commit
f1b7f13a
authored
11 years ago
by
Konstantin Osipov
Browse files
Options
Downloads
Plain Diff
Merge branch 'gh73-plugins_doesnt_work_on_tarantool' into stable
parents
657e0093
28a7f606
Loading
Loading
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/CMakeLists.txt
+1
-1
1 addition, 1 deletion
src/CMakeLists.txt
src/plugin/mysql/CMakeLists.txt
+1
-1
1 addition, 1 deletion
src/plugin/mysql/CMakeLists.txt
src/plugin/pg/CMakeLists.txt
+1
-1
1 addition, 1 deletion
src/plugin/pg/CMakeLists.txt
with
3 additions
and
3 deletions
src/CMakeLists.txt
+
1
−
1
View file @
f1b7f13a
...
...
@@ -211,7 +211,7 @@ function(tarantool_module mod)
"-DTARANTOOL_CONFIG='<cfg/tarantool_
${
mod
}
_cfg.h>'"
)
add_dependencies
(
lt
${
mod
}
generate_headers generate_admin_cc generate_memcached_grammar_cc build_bundled_libs
)
target_link_libraries
(
tarantool_
${
mod
}
lt
${
mod
}
${
common_libraries
}
)
target_link_libraries
(
tarantool_
${
mod
}
lt
${
mod
}
${
common_libraries
}
-rdynamic
)
if
(
ENABLE_STATIC
)
set_target_properties
(
tarantool_
${
mod
}
PROPERTIES
...
...
This diff is collapsed.
Click to expand it.
src/plugin/mysql/CMakeLists.txt
+
1
−
1
View file @
f1b7f13a
...
...
@@ -6,7 +6,7 @@ if (MYSQL_FOUND)
include_directories
(
${
MYSQL_INCLUDE_DIRS
}
)
add_library
(
mysql SHARED mysql.cc
)
target_link_libraries
(
mysql
${
MYSQL_LIBRARIES
}
)
target_link_libraries
(
mysql
${
MYSQL_LIBRARIES
}
-rdynamic
)
install
(
TARGETS mysql LIBRARY DESTINATION
${
PLUGIN_DIR
}
)
else
()
message
(
STATUS
"MySQL client not found, box.net.sql(mysql) disabled"
)
...
...
This diff is collapsed.
Click to expand it.
src/plugin/pg/CMakeLists.txt
+
1
−
1
View file @
f1b7f13a
...
...
@@ -7,7 +7,7 @@ if (PostgreSQL_FOUND)
include_directories
(
${
PostgreSQL_INCLUDE_DIRS
}
)
add_library
(
pg SHARED pg.cc
)
target_link_libraries
(
pg
${
PostgreSQL_LIBRARIES
}
)
target_link_libraries
(
pg
${
PostgreSQL_LIBRARIES
}
-rdynamic
)
install
(
TARGETS pg LIBRARY DESTINATION
${
PLUGIN_DIR
}
)
else
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment