diff --git a/dbcon/dmlpackageproc/CMakeLists.txt b/dbcon/dmlpackageproc/CMakeLists.txt index 9fed221a7..07a42050b 100644 --- a/dbcon/dmlpackageproc/CMakeLists.txt +++ b/dbcon/dmlpackageproc/CMakeLists.txt @@ -19,3 +19,4 @@ set_target_properties(dmlpackageproc PROPERTIES VERSION 1.0.0 SOVERSION 1) install(TARGETS dmlpackageproc DESTINATION ${ENGINE_LIBDIR}) + diff --git a/utils/dataconvert/CMakeLists.txt b/utils/dataconvert/CMakeLists.txt index 5a862b61d..2bff5c38d 100644 --- a/utils/dataconvert/CMakeLists.txt +++ b/utils/dataconvert/CMakeLists.txt @@ -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 diff --git a/utils/idbdatafile/CMakeLists.txt b/utils/idbdatafile/CMakeLists.txt index 35ef1ba3d..7e2101323 100644 --- a/utils/idbdatafile/CMakeLists.txt +++ b/utils/idbdatafile/CMakeLists.txt @@ -18,5 +18,4 @@ add_library(idbdatafile SHARED ${idbdatafile_LIB_SRCS}) set_target_properties(idbdatafile PROPERTIES VERSION 1.0.0 SOVERSION 1) -install(TARGETS idbdatafile DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS}) - +install(TARGETS idbdatafile DESTINATION ${ENGINE_LIBDIR}) diff --git a/utils/mysqlcl_idb/CMakeLists.txt b/utils/mysqlcl_idb/CMakeLists.txt index 65407fee1..574ce95b2 100644 --- a/utils/mysqlcl_idb/CMakeLists.txt +++ b/utils/mysqlcl_idb/CMakeLists.txt @@ -25,4 +25,3 @@ set_target_properties(mysqlcl_idb PROPERTIES VERSION 1.0.0 SOVERSION 1) install(TARGETS mysqlcl_idb DESTINATION ${ENGINE_LIBDIR}) -