From e3d4baace16bfaccb6249152761f2e05b480a848 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Sat, 12 Oct 2024 20:02:23 -0700 Subject: [PATCH] Modify CMake commands to install into svZeroDSolver. (#131) --- distribution/CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/distribution/CMakeLists.txt b/distribution/CMakeLists.txt index 874100a21..6f85beb9a 100644 --- a/distribution/CMakeLists.txt +++ b/distribution/CMakeLists.txt @@ -18,17 +18,19 @@ if(ENABLE_DISTRIBUTION) set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}") # define install location - set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/local/sv/ZeroDSolver/${CPACK_PACKAGE_VERSION}") + set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/local/sv/svZeroDSolver/${CPACK_PACKAGE_VERSION}") # define install target within build folder set(CPACK_OUTPUT_FILE_PREFIX ${CMAKE_BINARY_DIR}/distribution) if(APPLE) set(CPACK_GENERATOR "productbuild") - elseif(LINUX) + endif() + + if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") set(CPACK_GENERATOR DEB) set(CPACK_DEBIAN_PACKAGE_DEPENDS "") - endif(APPLE) + endif() # create the installer for both solver and calibrator install(TARGETS svzerodsolver svzerodcalibrator