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

Merge branch

Browse Source 
Conflicts:
	dbcon/dmlpackageproc/CMakeLists.txt
	oamapps/CMakeLists.txt
	utils/cacheutils/CMakeLists.txt
	utils/common/CMakeLists.txt
	utils/compress/CMakeLists.txt
	utils/dataconvert/CMakeLists.txt
	utils/idbdatafile/CMakeLists.txt
	utils/mysqlcl_idb/CMakeLists.txt
This commit is contained in:
Ben Thompson
2016-07-15 11:31:46 -05:00
parent 96a0526ac5 6bbb56b009
commit b7124b91b3
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/dataconvert/CMakeLists.txt
View File

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