Skip to content
Snippets Groups Projects

Adds the ability to build a package using CPack

Merged Adds the ability to build a package using CPack
sradigan/imstk:BuildPackage into master
Merged Sean Radigan requested to merge sradigan/imstk:BuildPackage into master

Could use a proper license file, but builds and runs on windows and linux.

To test: On Windows in visual studio make sure you build the PACKAGE project On Linux, in the SimMedTK-build directory run make package.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
CMake/SimMedTKMacros.cmake
46 51 target_include_directories(${target}
47 52 PUBLIC
48 53 $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
49 $<INSTALL_INTERFACE:include/v${SimMedTK_VERSION}>
50 $<INSTALL_INTERFACE:include/v${SimMedTK_VERSION}/${target}>
  • Sean Radigan
    Sean Radigan @sradigan started a thread on commit 2ac86681
    • CMake/SimMedTKMacros.cmake
    46 51 target_include_directories(${target}
    47 52 PUBLIC
    48 53 $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
    49 $<INSTALL_INTERFACE:include/v${SimMedTK_VERSION}>
    50 $<INSTALL_INTERFACE:include/v${SimMedTK_VERSION}/${target}>
    • Sean Radigan
      Sean Radigan @sradigan ·
      Author Contributor

      I wasn't sure, I guess I figured the generated package had a version on the install directory, and the libs didn't have a version number...so I took out the version number on the includes to make it a bit more uniform.

  • Ricardo Ortiz
    Ricardo Ortiz @ricardo-ortiz started a thread on commit 2ac86681
    • CMake/SimMedTKMacros.cmake
    46 51 target_include_directories(${target}
    47 52 PUBLIC
    48 53 $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
    49 $<INSTALL_INTERFACE:include/v${SimMedTK_VERSION}>
    50 $<INSTALL_INTERFACE:include/v${SimMedTK_VERSION}/${target}>
    • Ricardo Ortiz
      Ricardo Ortiz @ricardo-ortiz ·
      Contributor

      That is fine... If I recall correctly... The reason it was there was so that we can potentially have multiple versions of the libs there... maybe we'll put libs versioning at some point.

  • Ricardo Ortiz Added 1 commit:

    Added 1 commit:

    • b1f8b753 - Update sha1 sum for the data.
  • Kitware Robot
    Kitware Robot @kwrobot ·
    Owner

    Basic content checks passed!

    Changes since last check: compare

    Branch-at: b1f8b753
    Acked-by: @kwrobot

  • buildbot
    buildbot @buildbot ·
    Developer

    Your merge request has been queued for testing. You may view the test results on CDash or Buildbot.

    Branch-at: b1f8b753

  • Ricardo Ortiz
    Ricardo Ortiz @ricardo-ortiz ·
    Contributor

    +1 +2

    Builds in windows and linux... mac builbot is down for the moment. Go ahead an merge it. http://my.cdash.org/index.php?project=SimMedTK&date=2015-11-04

    Edited by Ricardo Ortiz
  • Ricardo Ortiz
    Ricardo Ortiz @ricardo-ortiz ·
    Contributor

    Do: merge

  • Kitware Robot
    Kitware Robot @kwrobot ·
    Owner

    Branch successfully merged and pushed!

  • Kitware Robot Status changed to merged

    Status changed to merged

  • Ricardo Ortiz mentioned in commit b924288d

    mentioned in commit b924288d

  • Alexis Girault Milestone removed

    Milestone removed

    • Please register or sign in to reply