-- cpack: fix binary package export

vectorgrp · Sep 20, 2022 · 493708f · 493708f
1 parent 55b9598
commit 493708f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/SilKit/cmake/SilKitInstall.cmake b/SilKit/cmake/SilKitInstall.cmake
@@ -46,15 +46,15 @@
 ### package.py is used to merge zip files together, see package.py --help for more infos
 
 include(GNUInstallDirs)
-set(INSTALL_TOP_DIR .)
+set(INSTALL_TOP_DIR "") # when changing add a "/"
 
-set(INSTALL_BIN_DIR ${INSTALL_TOP_DIR}/${CMAKE_INSTALL_BINDIR})
-set(INSTALL_LIB_DIR ${INSTALL_TOP_DIR}/${CMAKE_INSTALL_LIBDIR})
+set(INSTALL_BIN_DIR ${INSTALL_TOP_DIR}${CMAKE_INSTALL_BINDIR})
+set(INSTALL_LIB_DIR ${INSTALL_TOP_DIR}${CMAKE_INSTALL_LIBDIR})
 set(INSTALL_PYTHON_LIB_DIR ${INSTALL_LIB_DIR}/python/site-packages)
-set(INSTALL_CODE_DIR ${INSTALL_TOP_DIR}/${CMAKE_INSTALL_DATADIR})
-set(INSTALL_DATA_DIR ${INSTALL_TOP_DIR}/${CMAKE_INSTALL_DATADIR})
+set(INSTALL_CODE_DIR ${INSTALL_TOP_DIR}${CMAKE_INSTALL_DATADIR})
+set(INSTALL_DATA_DIR ${INSTALL_TOP_DIR}${CMAKE_INSTALL_DATADIR})
 set(INSTALL_CONFIG_DIR ${INSTALL_DATA_DIR}/cmake)
-set(INSTALL_INCLUDE_DIR ${INSTALL_TOP_DIR}/${CMAKE_INSTALL_INCLUDEDIR})
+set(INSTALL_INCLUDE_DIR ${INSTALL_TOP_DIR}${CMAKE_INSTALL_INCLUDEDIR})
 
 set(INSTALL_SOURCE_DIR SilKit-Source)
 set(INSTALL_DEMO_DIR SilKit-Demos)

diff --git a/SilKit/include/CMakeLists.txt b/SilKit/include/CMakeLists.txt
@@ -44,8 +44,8 @@ endif()
 install(
     TARGETS SilKitInterface
     EXPORT SilKitTargets
-    INCLUDES DESTINATION ${INSTALL_INCLUDE_DIR} # Destination for header files
     COMPONENT bin
+    INCLUDES DESTINATION ${INSTALL_INCLUDE_DIR} # Destination for header files
 )
 # Copy all headers from the source directory to the proper destination
 install(