From 24a1cbf75ff3ca78c959d1ceb5142ef2bcc42a52 Mon Sep 17 00:00:00 2001 From: Daniel Limberger Date: Fri, 12 Oct 2018 15:48:50 +0200 Subject: [PATCH] fix nsis pack --- CMakeLists.txt | 4 ++-- deploy/images/logo-cpplocate.png | Bin 11215 -> 0 bytes deploy/packages/pack-cpplocate.cmake | 16 ++++++++-------- source/cpplocate/CMakeLists.txt | 14 +++++++------- source/liblocate/CMakeLists.txt | 14 +++++++------- 5 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 deploy/images/logo-cpplocate.png diff --git a/CMakeLists.txt b/CMakeLists.txt index f6a282f..f7be977 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -185,8 +185,8 @@ add_subdirectory(deploy) install(FILES "${PROJECT_BINARY_DIR}/VERSION" DESTINATION ${INSTALL_ROOT} COMPONENT meta) # Install cmake find script for the project -install(FILES cpplocate-config.cmake DESTINATION ${INSTALL_ROOT} COMPONENT dev-cpp) -install(FILES liblocate-config.cmake DESTINATION ${INSTALL_ROOT} COMPONENT dev-c) +install(FILES cpplocate-config.cmake DESTINATION ${INSTALL_ROOT} COMPONENT dev_cpp) +install(FILES liblocate-config.cmake DESTINATION ${INSTALL_ROOT} COMPONENT dev_c) # Install the project meta files install(FILES AUTHORS DESTINATION ${INSTALL_ROOT} COMPONENT meta) diff --git a/deploy/images/logo-cpplocate.png b/deploy/images/logo-cpplocate.png deleted file mode 100644 index 37ed4b4867af0fad1cd573f2d032efdfa5cf811d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11215 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 F{{V8nv%~-Z diff --git a/deploy/packages/pack-cpplocate.cmake b/deploy/packages/pack-cpplocate.cmake index aa64c10..2a5efbf 100644 --- a/deploy/packages/pack-cpplocate.cmake +++ b/deploy/packages/pack-cpplocate.cmake @@ -58,18 +58,18 @@ set(CPACK_COMPONENT_RUNTIME_C_DESCRIPTION "Runtime components for ${META_PROJECT set(CPACK_COMPONENT_DEV_CPP_DISPLAY_NAME "C++ development files") set(CPACK_COMPONENT_DEV_CPP_DESCRIPTION "Development files for ${META_PROJECT_NAME} C++ library") -set(CPACK_COMPONENT_DEV_CPP_DEPENDS runtime-cpp) +set(CPACK_COMPONENT_DEV_CPP_DEPENDS runtime_cpp) set(CPACK_COMPONENT_DEV_C_DISPLAY_NAME "C development files") set(CPACK_COMPONENT_DEV_C_DESCRIPTION "Development files for ${META_PROJECT_NAME} C library") -set(CPACK_COMPONENT_DEV_C_DEPENDS runtime-c) +set(CPACK_COMPONENT_DEV_C_DEPENDS runtime_c) -set(CPACK_COMPONENTS_ALL meta runtime-cpp dev-cpp runtime-c dev-c) +set(CPACK_COMPONENTS_ALL meta runtime_cpp dev_cpp runtime_c dev_c) if (OPTION_BUILD_EXAMPLES) set(CPACK_COMPONENT_EXAMPLES_DISPLAY_NAME "Example applications") set(CPACK_COMPONENT_EXAMPLES_DESCRIPTION "Example applications for ${META_PROJECT_NAME} library") - set(CPACK_COMPONENT_EXAMPLES_DEPENDS runtime-cpp) + set(CPACK_COMPONENT_EXAMPLES_DEPENDS runtime_cpp) set(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} examples) endif() @@ -140,7 +140,7 @@ set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE") set(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README.md") set(CPACK_RESOURCE_FILE_WELCOME "${PROJECT_SOURCE_DIR}/README.md") set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.md") -set(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/deploy/images/logo.bmp") +# set(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/deploy/images/logo.bmp") set(CPACK_PACKAGE_FILE_NAME "${package_name}-${CPACK_PACKAGE_VERSION}") set(CPACK_PACKAGE_INSTALL_DIRECTORY "${package_name}") set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${package_name}") @@ -172,9 +172,9 @@ if(X64) endif() # Package options -#set(CPACK_NSIS_DISPLAY_NAME "${package_name}-${META_VERSION}") -set(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/deploy/images/logo.ico") -set(CPACK_NSIS_MUI_UNIICON "${PROJECT_SOURCE_DIR}/deploy/images/logo.ico") +# set(CPACK_NSIS_DISPLAY_NAME "${package_name}-${META_VERSION}") +# set(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/deploy/images/logo.ico") +# set(CPACK_NSIS_MUI_UNIICON "${PROJECT_SOURCE_DIR}/deploy/images/logo.ico") # Optional Preliminaries (i.e., silent Visual Studio Redistributable install) if(NOT INSTALL_MSVC_REDIST_FILEPATH) diff --git a/source/cpplocate/CMakeLists.txt b/source/cpplocate/CMakeLists.txt index 6393680..5c06a02 100644 --- a/source/cpplocate/CMakeLists.txt +++ b/source/cpplocate/CMakeLists.txt @@ -188,27 +188,27 @@ perform_health_checks( # Library install(TARGETS ${target} - EXPORT "${target}-export" COMPONENT dev-cpp - RUNTIME DESTINATION ${INSTALL_BIN} COMPONENT runtime-cpp - LIBRARY DESTINATION ${INSTALL_SHARED} COMPONENT runtime-cpp - ARCHIVE DESTINATION ${INSTALL_LIB} COMPONENT dev-cpp + EXPORT "${target}-export" COMPONENT dev_cpp + RUNTIME DESTINATION ${INSTALL_BIN} COMPONENT runtime_cpp + LIBRARY DESTINATION ${INSTALL_SHARED} COMPONENT runtime_cpp + ARCHIVE DESTINATION ${INSTALL_LIB} COMPONENT dev_cpp ) # Header files install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/${target} DESTINATION ${INSTALL_INCLUDE} - COMPONENT dev-cpp + COMPONENT dev_cpp ) # Generated header files install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/${target} DESTINATION ${INSTALL_INCLUDE} - COMPONENT dev-cpp + COMPONENT dev_cpp ) # CMake config install(EXPORT ${target}-export NAMESPACE ${META_PROJECT_NAME}:: DESTINATION ${INSTALL_CMAKE}/${target} - COMPONENT dev-cpp + COMPONENT dev_cpp ) diff --git a/source/liblocate/CMakeLists.txt b/source/liblocate/CMakeLists.txt index af115b4..84aea5e 100644 --- a/source/liblocate/CMakeLists.txt +++ b/source/liblocate/CMakeLists.txt @@ -185,27 +185,27 @@ perform_health_checks( # Library install(TARGETS ${target} - EXPORT "${target}-export" COMPONENT dev-c - RUNTIME DESTINATION ${INSTALL_BIN} COMPONENT runtime-c - LIBRARY DESTINATION ${INSTALL_SHARED} COMPONENT runtime-c - ARCHIVE DESTINATION ${INSTALL_LIB} COMPONENT dev-c + EXPORT "${target}-export" COMPONENT dev_c + RUNTIME DESTINATION ${INSTALL_BIN} COMPONENT runtime_c + LIBRARY DESTINATION ${INSTALL_SHARED} COMPONENT runtime_c + ARCHIVE DESTINATION ${INSTALL_LIB} COMPONENT dev_c ) # Header files install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/${target} DESTINATION ${INSTALL_INCLUDE} - COMPONENT dev-c + COMPONENT dev_c ) # Generated header files install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/${target} DESTINATION ${INSTALL_INCLUDE} - COMPONENT dev-c + COMPONENT dev_c ) # CMake config install(EXPORT ${target}-export NAMESPACE ${META_PROJECT_NAME}:: DESTINATION ${INSTALL_CMAKE}/${target} - COMPONENT dev-c + COMPONENT dev_c )