diff options
| author | Demitri Swan <demitriswan@gmail.com> | 2019-10-23 19:32:30 +0000 |
|---|---|---|
| committer | Demitri Swan <demitriswan@gmail.com> | 2019-10-23 20:08:58 +0000 |
| commit | de163067e8ade8aaf8b2d75f5871db7b57ab6d0e (patch) | |
| tree | d79caeb22b2eb13554b15688c2f8c34f126f4bfd | |
| parent | 85074b7c7d44f721f90c123dcdf052bbdbed7923 (diff) | |
Update auto package and package paths in CMake build for promtest
| -rwxr-xr-x | autolib/cmd/package | 4 | ||||
| -rw-r--r-- | promtest/CMakeLists.txt | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/autolib/cmd/package b/autolib/cmd/package index 8beef1c..b1d0d35 100755 --- a/autolib/cmd/package +++ b/autolib/cmd/package @@ -39,10 +39,12 @@ EOF source $(dirname ${BASH_SOURCE[0]})/../autolib.sh +LIBS=(prom promhttp) + run(){ local r autolib_check_dev || return $? - autolib_output_banner "Executing ${PROGRAM_NAME}AME}" + autolib_output_banner "Executing ${PROGRAM_NAME}" for lib in ${LIBS[@]}; do pushd ${lib} > /dev/null || return $? diff --git a/promtest/CMakeLists.txt b/promtest/CMakeLists.txt index 55cfe53..32ae3b0 100644 --- a/promtest/CMakeLists.txt +++ b/promtest/CMakeLists.txt @@ -29,8 +29,8 @@ execute_process( project(promtest VERSION ${Version} LANGUAGES C) -set(prom_deb ${CMAKE_CURRENT_SOURCE_DIR}/../prom/_CPack_Packages/Linux/DEB/libprom-dev-${Version}-Linux.deb) -set(promhttp_deb ${CMAKE_CURRENT_SOURCE_DIR}/../promhttp/_CPack_Packages/Linux/DEB/libpromhttp-dev-${Version}-Linux.deb) +set(prom_deb ${CMAKE_CURRENT_SOURCE_DIR}/../prom/libprom-dev-${Version}-Linux.deb) +set(promhttp_deb ${CMAKE_CURRENT_SOURCE_DIR}/../promhttp/libpromhttp-dev-${Version}-Linux.deb) execute_process( COMMAND dpkg -i ${prom_deb} |