From ba2a66f58971138787b1c543ceb8088a96dbb5a8 Mon Sep 17 00:00:00 2001 From: Ben Thompson Date: Fri, 15 Jul 2016 15:07:35 -0500 Subject: [PATCH] More cmakefile fixes --- CMakeLists.txt | 5 +++-- dbcon/mysql/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6bf935eb9..640e965fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -313,10 +313,11 @@ ExternalProject_Add( libnetsnmpmibs SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/net-snmp/net-snmp CONFIGURE_COMMAND ./configure --prefix=${INSTALL_ENGINE} --with-mib-modules=disman/event-mib --with-cc=gcc --with-logfile=${INSTALL_ENGINE}/log/snmpd.log --with-sys-location=Unknown --with-sys-contact=root@localhost.localdomain --with-default-snmp-version=3 --with-persistent-directory=${INSTALL_ENGINE}/var/net-snmp --without-openssl --with-ldflags=-Wl,-rpath\ -Wl,${INSTALL_ENGINE}/lib - BUILD_COMMAND "" - INSTALL_COMMAND make + BUILD_COMMAND make + INSTALL_COMMAND "" BUILD_IN_SOURCE 1 ) +INSTALL ( CODE "EXECUTE_PROCESS(COMMAND make install WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/net-snmp/net-snmp)") ADD_SUBDIRECTORY(utils) ADD_SUBDIRECTORY(oam/oamcpp) diff --git a/dbcon/mysql/CMakeLists.txt b/dbcon/mysql/CMakeLists.txt index 13183f16a..60a6f708f 100644 --- a/dbcon/mysql/CMakeLists.txt +++ b/dbcon/mysql/CMakeLists.txt @@ -32,7 +32,7 @@ install(FILES syscatalog_mysql.sql calshowprocesslist.sql my.cnf DESTINATION ${ENGINE_MYSQLDIR}) -install(FILES install_calpont_mysql.sh mysql-Columnstore dumpcat.pl +install(PROGRAMS install_calpont_mysql.sh mysql-Columnstore dumpcat.pl DESTINATION ${ENGINE_MYSQLDIR})