Changeset: 923c4095b945 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=923c4095b945
Modified Files:
gdk/CMakeLists.txt
monetdb5/tools/CMakeLists.txt
Branch: cmake-fun
Log Message:
Build gdk libraries on Windows.
diffs (95 lines):
diff --git a/gdk/CMakeLists.txt b/gdk/CMakeLists.txt
--- a/gdk/CMakeLists.txt
+++ b/gdk/CMakeLists.txt
@@ -8,35 +8,51 @@
include_directories(../common/options ../common/stream ../common/utils
${VALGRIND_INCLUDE_DIR})
-add_library(gdk SHARED
- gdk_select.c
- gdk_calc.c gdk_calc.h gdk_calc_compare.h
gdk_calc_private.h
- gdk_ssort.c gdk_ssort_impl.h
- gdk_aggr.c
- gdk.h gdk_cand.h gdk_atomic.h gdk_batop.c
- gdk_search.c gdk_hash.c gdk_hash.h gdk_tm.c
- gdk_orderidx.c
- gdk_align.c gdk_bbp.c gdk_bbp.h
- gdk_heap.c gdk_utils.c gdk_utils.h
- gdk_atoms.c gdk_atoms.h gdk_string.c
- gdk_qsort.c gdk_qsort_impl.h
- gdk_storage.c gdk_bat.c
- gdk_delta.c gdk_cross.c gdk_system.c gdk_value.c
- gdk_posix.c gdk_logger.c gdk_sample.c
xoshiro256starstar.h
- gdk_private.h gdk_delta.h gdk_logger.h gdk_posix.h
- gdk_system.h gdk_system_private.h gdk_tm.h gdk_storage.h
- gdk_group.c
- gdk_imprints.c gdk_imprints.h
- gdk_join.c gdk_project.c
- gdk_unique.c
- gdk_interprocess.c gdk_interprocess.h
- gdk_firstn.c
- gdk_analytic_bounds.c
- 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 RUNTIME_OUTPUT_NAME bat
LIBRARY_OUTPUT_NAME bat
- VERSION ${GDK_VERSION} SOVERSION
${GDK_VERSION_MAJOR})
+set(GDK_OBJECTS
+ gdk_select.c
+ gdk_calc.c gdk_calc.h gdk_calc_compare.h gdk_calc_private.h
+ gdk_ssort.c gdk_ssort_impl.h
+ gdk_aggr.c
+ gdk.h gdk_cand.h gdk_atomic.h gdk_batop.c
+ gdk_search.c gdk_hash.c gdk_hash.h gdk_tm.c
+ gdk_orderidx.c
+ gdk_align.c gdk_bbp.c gdk_bbp.h
+ gdk_heap.c gdk_utils.c gdk_utils.h
+ gdk_atoms.c gdk_atoms.h gdk_string.c
+ gdk_qsort.c gdk_qsort_impl.h
+ gdk_storage.c gdk_bat.c
+ gdk_delta.c gdk_cross.c gdk_system.c gdk_value.c
+ gdk_posix.c gdk_logger.c gdk_sample.c xoshiro256starstar.h
+ gdk_private.h gdk_delta.h gdk_logger.h gdk_posix.h
+ gdk_system.h gdk_system_private.h gdk_tm.h gdk_storage.h
+ gdk_group.c
+ gdk_imprints.c gdk_imprints.h
+ gdk_join.c gdk_project.c
+ gdk_unique.c
+ gdk_interprocess.c gdk_interprocess.h
+ gdk_firstn.c
+ gdk_analytic_bounds.c
+ gdk_analytic_func.c gdk_analytic.h)
+
+set(GDK_LIBRARIES ${MATH_LIBRARIES} ${SOCKET_LIBRARIES} ${MALLOC_LIBRARIES}
${PTHREAD_LIBRARIES} ${DL_LIBRARIES}
+ moptions mutils stream)
+
+if(MSVC)
+ add_library(gdk STATIC ${GDK_OBJECTS})
+ target_link_libraries(monetdb5 PRIVATE ${GDK_LIBRARIES})
+ set_target_properties(gdk PROPERTIES OUTPUT_NAME bat)
+
+ add_library(gdkshared SHARED ${GDK_OBJECTS})
+ target_link_libraries(gdkshared PRIVATE ${GDK_LIBRARIES})
+ set_target_properties(gdkshared PROPERTIES OUTPUT_NAME bat)
+ install(TARGETS gdkshared LIBRARY DESTINATION ${LIBDIR})
+ target_compile_definitions(gdkshared PRIVATE LIBGDK)
+else()
+ add_library(gdk SHARED ${GDK_OBJECTS})
+ target_link_libraries(gdk PRIVATE PRIVATE ${GDK_LIBRARIES})
+ set_target_properties(gdk PROPERTIES VERSION ${GDK_VERSION} SOVERSION
${GDK_VERSION_MAJOR}
+ RUNTIME_OUTPUT_NAME bat
LIBRARY_OUTPUT_NAME bat)
+endif()
target_compile_definitions(gdk PRIVATE LIBGDK)
install(TARGETS gdk LIBRARY DESTINATION ${LIBDIR})
diff --git a/monetdb5/tools/CMakeLists.txt b/monetdb5/tools/CMakeLists.txt
--- a/monetdb5/tools/CMakeLists.txt
+++ b/monetdb5/tools/CMakeLists.txt
@@ -22,6 +22,7 @@ if(MSVC)
add_library(monetdb5shared SHARED monetdb.c)
target_link_libraries(monetdb5shared PRIVATE
${MONETDB5_PRIVATE_LINK_OBJECTS} PUBLIC ${MONETDB5_PUBLIC_LINK_OBJECTS})
set_target_properties(monetdb5shared PROPERTIES OUTPUT_NAME monetdb5)
+ install(TARGETS monetdb5shared DESTINATION ${LIBDIR})
else()
add_library(monetdb5 SHARED monetdb.c)
target_link_libraries(monetdb5 PRIVATE ${MONETDB5_PRIVATE_LINK_OBJECTS}
PUBLIC ${MONETDB5_PUBLIC_LINK_OBJECTS})
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
