diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-04 13:26:30 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-12 17:46:35 +0200 |
| commit | 1fc49d3d1a2771bbf55146e458465b2b116edfd4 (patch) | |
| tree | 83a92bc88afe1b935d6c46f45f955c27ee140dbd /cmake/libutils.cmake | |
| parent | ca02ad4fb075db525431d700ff86b5ead6d9b7fd (diff) | |
| download | mariadb-git-1fc49d3d1a2771bbf55146e458465b2b116edfd4.tar.gz | |
Add C/C as a submodule in libmariadb/
also
* fix includes
* rename cmake macros and targets to avoid name clashes
Diffstat (limited to 'cmake/libutils.cmake')
| -rw-r--r-- | cmake/libutils.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake index bcba924dfa8..0965ec8cb83 100644 --- a/cmake/libutils.cmake +++ b/cmake/libutils.cmake @@ -58,13 +58,13 @@ IF(WIN32 OR CYGWIN OR APPLE OR WITH_PIC OR DISABLE_SHARED OR NOT CMAKE_SHARED_LI ENDIF() INCLUDE(CMakeParseArguments) -# CREATE_EXPORT_FILE (VAR target api_functions) +# CREATE_EXPORTS_FILE (VAR target api_functions) # Internal macro, used to create source file for shared libraries that # otherwise consists entirely of "convenience" libraries. On Windows, # also exports API functions as dllexport. On unix, creates a dummy file # that references all exports and this prevents linker from creating an # empty library(there are unportable alternatives, --whole-archive) -MACRO(CREATE_EXPORT_FILE VAR TARGET API_FUNCTIONS) +MACRO(CREATE_EXPORTS_FILE VAR TARGET API_FUNCTIONS) IF(WIN32) SET(DUMMY ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_dummy.c) SET(EXPORTS ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_exports.def) @@ -255,7 +255,7 @@ MACRO(MERGE_LIBRARIES) ENDIF() ENDFOREACH() ENDIF() - CREATE_EXPORT_FILE(SRC ${TARGET} "${ARG_EXPORTS}") + CREATE_EXPORTS_FILE(SRC ${TARGET} "${ARG_EXPORTS}") IF(NOT ARG_NOINSTALL) ADD_VERSION_INFO(${TARGET} SHARED SRC) ENDIF() |