fix nsis pack

cginternals · Oct 12, 2018 · 24a1cbf · 24a1cbf
1 parent dc8bca2
commit 24a1cbf
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
 )