Changeset: b9ff84d1a63f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b9ff84d1a63f
Modified Files:
CMakeLists.txt
clients/odbc/winsetup/install.c
gdk/CMakeLists.txt
geom/monetdb5/CMakeLists.txt
monetdb5/extras/mal_optimizer_template/CMakeLists.txt
monetdb5/extras/rapi/rapi.R
monetdb5/mal/mal_linker.c
sql/backends/monet5/CMakeLists.txt
sql/backends/monet5/generator/CMakeLists.txt
Branch: cmake-fun
Log Message:
Windows libraries don't have to start with "lib".
diffs (151 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -735,7 +735,7 @@ endif()
if(WIN32)
set(OS_DIRSEP "\\\\")
set(OS_PATHSEP ";")
- set(SO_PREFIX "lib")
+ set(SO_PREFIX "")
elseif(UNIX OR APPLE OR ${CMAKE_SYSTEM_NAME} STREQUAL "CYGWIN")
set(OS_DIRSEP "/")
set(OS_PATHSEP ":")
diff --git a/clients/odbc/winsetup/install.c b/clients/odbc/winsetup/install.c
--- a/clients/odbc/winsetup/install.c
+++ b/clients/odbc/winsetup/install.c
@@ -19,8 +19,8 @@
static char *DriverName = "MonetDB ODBC Driver";
static char *DataSourceName = "MonetDB";
-static char *DriverDLL = "libMonetODBC" DLL;
-static char *DriverDLLs = "libMonetODBCs" DLL;
+static char *DriverDLL = "MonetODBC" DLL;
+static char *DriverDLLs = "MonetODBCs" DLL;
/* General error handler for installer functions */
diff --git a/gdk/CMakeLists.txt b/gdk/CMakeLists.txt
--- a/gdk/CMakeLists.txt
+++ b/gdk/CMakeLists.txt
@@ -35,8 +35,7 @@ add_library(gdk SHARED
gdk_analytic_func.c gdk_analytic.h)
target_link_libraries(gdk PRIVATE ${MATH_LIBRARIES} ${SOCKET_LIBRARIES}
${MALLOC_LIBRARIES} ${PTHREAD_LIBRARIES}
${DL_LIBRARIES} moptions mutils
stream)
-set_target_properties(gdk PROPERTIES VERSION ${GDK_VERSION} SOVERSION
${GDK_VERSION_MAJOR} RUNTIME_OUTPUT_NAME bat
- LIBRARY_OUTPUT_NAME bat)
+set_target_properties(gdk PROPERTIES VERSION ${GDK_VERSION} SOVERSION
${GDK_VERSION_MAJOR} OUTPUT_NAME bat)
target_compile_definitions(gdk PRIVATE LIBGDK)
install(TARGETS gdk DESTINATION ${LIBDIR})
diff --git a/geom/monetdb5/CMakeLists.txt b/geom/monetdb5/CMakeLists.txt
--- a/geom/monetdb5/CMakeLists.txt
+++ b/geom/monetdb5/CMakeLists.txt
@@ -11,7 +11,6 @@ include_directories(../lib ../../gdk ../
add_library(geom MODULE geom.h geom.c geomBulk.c geom_upgrade.c)
target_link_libraries(geom PRIVATE geomobj gdk stream monetdb5 ${GEOS_LIBS}
${PROJ_LIBRARIES})
-set_target_properties(geom PROPERTIES RUNTIME_OUTPUT_NAME _geom
LIBRARY_OUTPUT_NAME _geom)
target_compile_definitions(geom PRIVATE LIBGEOM)
install(TARGETS geom DESTINATION ${LIBDIR}/monetdb5)
diff --git a/monetdb5/extras/mal_optimizer_template/CMakeLists.txt
b/monetdb5/extras/mal_optimizer_template/CMakeLists.txt
--- a/monetdb5/extras/mal_optimizer_template/CMakeLists.txt
+++ b/monetdb5/extras/mal_optimizer_template/CMakeLists.txt
@@ -10,7 +10,6 @@ include_directories(../../optimizer ../.
add_library(opt_sql_append MODULE opt_sql_append.c opt_sql_append.h)
target_link_libraries(opt_sql_append PRIVATE monetdb5 gdk)
-set_target_properties(opt_sql_append PROPERTIES RUNTIME_OUTPUT_NAME
_opt_sql_append LIBRARY_OUTPUT_NAME _opt_sql_append)
target_compile_definitions(opt_sql_append PRIVATE LIBOPT_SQL_APPEND)
install(TARGETS opt_sql_append DESTINATION ${LIBDIR}/monetdb5)
diff --git a/monetdb5/extras/rapi/rapi.R b/monetdb5/extras/rapi/rapi.R
--- a/monetdb5/extras/rapi/rapi.R
+++ b/monetdb5/extras/rapi/rapi.R
@@ -53,7 +53,7 @@ rewireFunc("q", quit, "base")
rm(rewireFunc)
loopback_query <- function(query) {
- dyn.load(file.path(MONETDB_LIBDIR, "monetdb5", "lib_rapi.so"))
+ dyn.load(file.path(MONETDB_LIBDIR, "monetdb5", "librapi.so"))
res <- .Call("RAPIloopback", paste0(query, "\n;"), package="lib_rapi")
if (is.character(res)) {
stop(res)
diff --git a/monetdb5/mal/mal_linker.c b/monetdb5/mal/mal_linker.c
--- a/monetdb5/mal/mal_linker.c
+++ b/monetdb5/mal/mal_linker.c
@@ -110,17 +110,17 @@ getAddress(str fcnname)
*
* the first argument must be the same as the base name of the
* library that is created in src/tools */
- dl = mdlopen("libmonetdb5", RTLD_NOW | RTLD_GLOBAL);
+ dl = mdlopen(SO_PREFIX "monetdb5", RTLD_NOW | RTLD_GLOBAL);
if (dl == NULL)
return NULL;
adr = (MALfcn) dlsym(dl, fcnname);
- filesLoaded[lastfile].modname = GDKstrdup("libmonetdb5");
+ filesLoaded[lastfile].modname = GDKstrdup(SO_PREFIX "monetdb5");
if(filesLoaded[lastfile].modname == NULL) {
dlclose(dl);
return NULL;
}
- filesLoaded[lastfile].fullname = GDKstrdup("libmonetdb5");
+ filesLoaded[lastfile].fullname = GDKstrdup(SO_PREFIX "monetdb5");
if(filesLoaded[lastfile].fullname == NULL) {
dlclose(dl);
GDKfree(filesLoaded[lastfile].modname);
@@ -194,11 +194,11 @@ loadLibrary(str filename, int flag)
/* try hardcoded SO_EXT if that is the same for modules */
#ifdef _AIX
- len = snprintf(nme, FILENAME_MAX, "%.*s%c%s_%s%s(%s_%s.0)",
+ len = snprintf(nme, FILENAME_MAX, "%.*s%c%s%s%s(%s%s.0)",
(int) (p - mod_path),
mod_path, DIR_SEP, SO_PREFIX, s, SO_EXT,
SO_PREFIX, s);
#else
- len = snprintf(nme, FILENAME_MAX, "%.*s%c%s_%s%s",
+ len = snprintf(nme, FILENAME_MAX, "%.*s%c%s%s%s",
(int) (p - mod_path),
mod_path, DIR_SEP, SO_PREFIX, s, SO_EXT);
#endif
@@ -209,7 +209,7 @@ loadLibrary(str filename, int flag)
throw(LOADER, "loadLibrary", RUNTIME_LOAD_ERROR "
failed to open library %s (from within file '%s'): %s", s, nme, dlerror());
if (handle == NULL && strcmp(SO_EXT, ".so") != /* DISABLES CODE
*/ (0)) {
/* try .so */
- len = snprintf(nme, FILENAME_MAX, "%.*s%c%s_%s.so",
+ len = snprintf(nme, FILENAME_MAX, "%.*s%c%s%s.so",
(int) (p - mod_path),
mod_path, DIR_SEP, SO_PREFIX, s);
if (len == -1 || len >= FILENAME_MAX)
@@ -221,7 +221,7 @@ loadLibrary(str filename, int flag)
#ifdef __APPLE__
if (handle == NULL && strcmp(SO_EXT, ".bundle") != 0) {
/* try .bundle */
- len = snprintf(nme, FILENAME_MAX, "%.*s%c%s_%s.bundle",
+ len = snprintf(nme, FILENAME_MAX, "%.*s%c%s%s.bundle",
(int) (p - mod_path),
mod_path, DIR_SEP, SO_PREFIX, s);
if (len == -1 || len >= FILENAME_MAX)
diff --git a/sql/backends/monet5/CMakeLists.txt
b/sql/backends/monet5/CMakeLists.txt
--- a/sql/backends/monet5/CMakeLists.txt
+++ b/sql/backends/monet5/CMakeLists.txt
@@ -44,7 +44,6 @@ add_library(sql MODULE
sql_datetrunc.c
sql_rank.c sql_rank.h)
target_link_libraries(sql PRIVATE monetdb5 mapi gdk stream ${CRYPTO_LIBRARIES}
PUBLIC sqlserver store batstore sqlcommon)
-set_target_properties(sql PROPERTIES RUNTIME_OUTPUT_NAME _sql
LIBRARY_OUTPUT_NAME _sql)
target_compile_definitions(sql PRIVATE LIBSQL LIBSQLSERVER LIBSQLCOMMON
LIBBATSTORE LIBSTORE)
install(TARGETS sql DESTINATION ${LIBDIR}/monetdb5)
diff --git a/sql/backends/monet5/generator/CMakeLists.txt
b/sql/backends/monet5/generator/CMakeLists.txt
--- a/sql/backends/monet5/generator/CMakeLists.txt
+++ b/sql/backends/monet5/generator/CMakeLists.txt
@@ -13,7 +13,6 @@ include_directories(../../../include ../
add_library(generator MODULE generator.c generator.h)
target_link_libraries(generator PRIVATE monetdb5 gdk)
-set_target_properties(generator PROPERTIES RUNTIME_OUTPUT_NAME _generator
LIBRARY_OUTPUT_NAME _generator)
target_compile_definitions(generator PRIVATE LIBGENERATOR)
install(TARGETS generator DESTINATION ${LIBDIR}/monetdb5)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
