database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-07 03:22:57 +03:00
Code Activity

Broken file after merge

Browse Source
This commit is contained in:
Ben Thompson
2016-07-15 11:35:27 -05:00
parent b7124b91b3
commit f7fc893f03
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
utils/dataconvert/CMakeLists.txt
View File

@@ -10,9 +10,4 @@ add_library(dataconvert SHARED ${dataconvert_LIB_SRCS})
set_target_properties(dataconvert PROPERTIES VERSION 1.0.0 SOVERSION 1) set_target_properties(dataconvert PROPERTIES VERSION 1.0.0 SOVERSION 1)
<<<<<<< HEAD
install(TARGETS dataconvert DESTINATION ${ENGINE_LIBDIR}) install(TARGETS dataconvert DESTINATION ${ENGINE_LIBDIR})
=======
#install(TARGETS dataconvert DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
>>>>>>> 6bbb56b0091c6f90b74049e682009f3d1f57d45e