From b181d78c931afe11d841373a10da7deda927f70c Mon Sep 17 00:00:00 2001 From: aiekick Date: Sat, 21 Oct 2023 01:07:26 +0200 Subject: [PATCH] - --- CMakeLists.txt | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b13cb7c..c360070 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ set(PROJECT MdlToObj) set(ORGANIZATION_NAME "FunParadigm") set(VERSION_MAJOR 0) set(VERSION_MINOR 1) -set(PROJECT_VER ${VERSION_MAJOR}.${VERSION_MINOR}) +set(PROJECT_VER "${VERSION_MAJOR}.${VERSION_MINOR}") enable_language(C CXX) @@ -30,8 +30,9 @@ else() set(ARCH x32) endif() -set(FINAL_BIN_DIR ${CMAKE_SOURCE_DIR}/bin) -set(CMAKE_INSTALL_PREFIX "${FINAL_BIN_DIR}") +set(FINAL_BIN_DIR "${CMAKE_SOURCE_DIR}/bin") +set(CMAKE_INSTALL_PREFIX .) +set(CMAKE_INSTALL_BINDIR .) set(${PROJECT}_OUTPUT_NAME "${PROJECT}_${CMAKE_SYSTEM_NAME}_$<$:Debug>$<$:Release>$<$:MinSizeRel>$<$:RelWithDebInfo>_${ARCH}") set_target_properties(${PROJECT} PROPERTIES OUTPUT_NAME "${${PROJECT}_OUTPUT_NAME}") @@ -43,7 +44,7 @@ set_target_properties(${PROJECT} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE "${ ### INSTALL ################################################# ############################################################# -install(TARGETS ${PROJECT} RUNTIME DESTINATION / COMPONENT APP_BINARY) +install(TARGETS ${PROJECT} RUNTIME DESTINATION .) ############################################################# ### PACKAGE ################################################# @@ -51,18 +52,16 @@ install(TARGETS ${PROJECT} RUNTIME DESTINATION / COMPONENT APP_BINARY) ############################################################# set(CPACK_GENERATOR "ZIP") -set(CPACK_MONOLITHIC_INSTALL 1) set(CPACK_THREADS 8) if (UNIX) set(CPACK_SET_DESTDIR ON) endif() -set(CPACK_ZIP_COMPONENT_INSTALL ON) +set(CPACK_MONOLITHIC_INSTALL 1) set(CPACK_PACKAGE_VENDOR ${ORGANIZATION_NAME}) -set(CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE 1) set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR}) set(CPACK_PACKAGE_NAME ${PROJECT}) -SET(CPACK_OUTPUT_FILE_PREFIX "${CMAKE_INSTALL_PREFIX}/") +set(CPACK_OUTPUT_FILE_PREFIX ${CMAKE_SOURCE_DIR}/bin) set(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}") include(CPack)