Skip to content

Commit 1d5d760

Browse files
authored
Merge pull request #111 from jcfr/fix-macos-packaging-of-SPHARM-ShapePopulationViewer-ShapeRegressionExtension-shape4D
Fix packaging of: SPHARM-PDM, ShapePopulationViewer, ShapeRegressionExtension and shape4D
2 parents 814be8a + 94bf790 commit 1d5d760

File tree

6 files changed

+100
-8
lines changed

6 files changed

+100
-8
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if(NOT DEFINED slicersources_SOURCE_DIR)
1717
# Download Slicer sources and set variables slicersources_SOURCE_DIR and slicersources_BINARY_DIR
1818
FetchContent_Populate(slicersources
1919
GIT_REPOSITORY https://github.com/jcfr/Slicer
20-
GIT_TAG e08d28f2e8ced063b55c541142be86e10a94f218 # slicersalt-4.9-2018-09-13-8c19c293c
20+
GIT_TAG cd7d51ce9b613bdf966281d9a841017473ec0c07 # slicersalt-4.9-2018-09-13-8c19c293c
2121
GIT_PROGRESS 1
2222
)
2323
else()

SuperBuild/External_SPHARM-PDM.cmake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ if(NOT DEFINED ${proj}_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
5353
set(${proj}_PACKAGE_DIR ${${proj}_DIR}/${proj}-build)
5454
ExternalProject_Add(${proj}
5555
${${proj}_EP_ARGS}
56-
GIT_REPOSITORY "${EP_GIT_PROTOCOL}://github.com/NIRALUser/SPHARM-PDM.git"
57-
GIT_TAG "ed916619c03b4e14ed7700a5d1b9c084472b2a4b" # 2018-09-14
56+
GIT_REPOSITORY "${EP_GIT_PROTOCOL}://github.com/jcfr/SPHARM-PDM.git"
57+
GIT_TAG "09407a2549d601164b06cd9f41df7b97f37a35e7" # slicersalt-2018-09-14-ed916619c
5858
SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
5959
BINARY_DIR ${${proj}_DIR}
6060
INSTALL_COMMAND ${CMAKE_COMMAND} --build ${${proj}_PACKAGE_DIR} --config ${config} --target package
@@ -71,6 +71,7 @@ if(NOT DEFINED ${proj}_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
7171
-DSlicer_DIR:PATH=${Slicer_INNER_BUILD_DIR}
7272
# Options
7373
-D${proj}_BUILD_SLICER_EXTENSION:BOOL=ON
74+
-DBUILD_TESTING:BOOL=OFF
7475
DEPENDS
7576
${${proj}_DEPENDENCIES}
7677
)

SuperBuild/External_ShapePopulationViewer.cmake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ if(NOT DEFINED ${proj}_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
5353
set(${proj}_PACKAGE_DIR ${${proj}_DIR})
5454
ExternalProject_Add(${proj}
5555
${${proj}_EP_ARGS}
56-
GIT_REPOSITORY "${EP_GIT_PROTOCOL}://github.com/NIRALUser/ShapePopulationViewer.git"
57-
GIT_TAG "76d356d44f0d0bc9f4901b05452d692d846c2636" # 2018-09-14
56+
GIT_REPOSITORY "${EP_GIT_PROTOCOL}://github.com/jcfr/ShapePopulationViewer.git"
57+
GIT_TAG "3a39e526238f5b5f55928e41369f9a4cb751d145" # slicersalt-2018-09-14-76d356d44
5858
SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
5959
BINARY_DIR ${${proj}_DIR}
6060
INSTALL_COMMAND ${CMAKE_COMMAND} --build ${${proj}_PACKAGE_DIR} --config ${config} --target package
@@ -71,6 +71,7 @@ if(NOT DEFINED ${proj}_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
7171
-DSlicer_DIR:PATH=${Slicer_INNER_BUILD_DIR}
7272
# Options
7373
-D${proj}_BUILD_SLICER_EXTENSION:BOOL=ON
74+
-DBUILD_TESTING:BOOL=OFF
7475
DEPENDS
7576
${${proj}_DEPENDENCIES}
7677
)

SuperBuild/External_ShapeRegressionExtension.cmake

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
set(proj ShapeRegressionExtension)
2323

2424
# Set dependency list
25-
set(${proj}_DEPENDENCIES "")
25+
set(${proj}_DEPENDENCIES
26+
shape4D
27+
)
2628

2729
# Include dependent projects if any
2830
ExternalProject_Include_Dependencies(${proj}
@@ -53,8 +55,8 @@ if(NOT DEFINED ${proj}_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
5355
set(${proj}_PACKAGE_DIR ${${proj}_DIR}/${proj}-build)
5456
ExternalProject_Add(${proj}
5557
${${proj}_EP_ARGS}
56-
GIT_REPOSITORY "${EP_GIT_PROTOCOL}://github.com/KitwareMedical/ShapeRegressionExtension.git"
57-
GIT_TAG "983564f9cdd51cfcb3e35ab26e15d7db314b7d54 " # 2018-09-13 (master)
58+
GIT_REPOSITORY "${EP_GIT_PROTOCOL}://github.com/jcfr/ShapeRegressionExtension.git"
59+
GIT_TAG "35bbc25d185689bdf71798e7a6ff212873dc4969 " # 2018-09-13 (master)
5860
SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
5961
BINARY_DIR ${${proj}_DIR}
6062
INSTALL_COMMAND ${CMAKE_COMMAND} --build ${${proj}_PACKAGE_DIR} --config ${config} --target package
@@ -71,6 +73,7 @@ if(NOT DEFINED ${proj}_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
7173
-DSlicer_DIR:PATH=${Slicer_INNER_BUILD_DIR}
7274
# Options
7375
-D${proj}_BUILD_SLICER_EXTENSION:BOOL=ON
76+
-DBUILD_TESTING:BOOL=OFF
7477
DEPENDS
7578
${${proj}_DEPENDENCIES}
7679
)

SuperBuild/External_shape4D.cmake

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
#============================================================================
2+
#
3+
# Copyright (c) Kitware, Inc.
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0.txt
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
#============================================================================
18+
#
19+
# External project for the project.
20+
#
21+
22+
set(proj shape4D)
23+
24+
# Set dependency list
25+
set(${proj}_DEPENDENCIES
26+
""
27+
)
28+
29+
# Include dependent projects if any
30+
ExternalProject_Include_Dependencies(${proj}
31+
PROJECT_VAR proj
32+
DEPENDS_VAR ${proj}_DEPENDENCIES
33+
SUPERBUILD_VAR Slicer_SUPERBUILD
34+
)
35+
36+
list(APPEND ${proj}_DEPENDENCIES Slicer)
37+
38+
if(${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
39+
message(FATAL_ERROR "Enabling ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj} is not supported !")
40+
endif()
41+
42+
# Sanity checks
43+
if(DEFINED ${proj}_DIR AND NOT EXISTS ${${proj}_DIR})
44+
message(FATAL_ERROR "${proj}_DIR variable is defined but corresponds to non-existing directory")
45+
endif()
46+
47+
if(NOT DEFINED ${proj}_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
48+
49+
set(config ${CMAKE_BUILD_TYPE})
50+
if(DEFINED CMAKE_CONFIGURATION_TYPES)
51+
set(config ${CMAKE_CFG_INTDIR})
52+
endif()
53+
54+
set(${proj}_DIR ${CMAKE_BINARY_DIR}/${proj}-build)
55+
set(${proj}_PACKAGE_DIR ${${proj}_DIR}/${proj}-build)
56+
ExternalProject_Add(${proj}
57+
${${proj}_EP_ARGS}
58+
GIT_REPOSITORY "${EP_GIT_PROTOCOL}://github.com/jcfr/shape4D.git"
59+
GIT_TAG "3f47cf711a3d21a441c1e46ea992b0f0480b5cf8" # slicersalt-2018-01-22-c74c766a4c
60+
SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
61+
BINARY_DIR ${${proj}_DIR}
62+
INSTALL_COMMAND ${CMAKE_COMMAND} --build ${${proj}_PACKAGE_DIR} --config ${config} --target package
63+
CMAKE_CACHE_ARGS
64+
# Compiler settings
65+
-DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
66+
-DCMAKE_C_FLAGS:STRING=${ep_common_c_flags}
67+
-DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
68+
-DCMAKE_CXX_FLAGS:STRING=${ep_common_cxx_flags}
69+
-DCMAKE_CXX_STANDARD:STRING=${CMAKE_CXX_STANDARD}
70+
-DCMAKE_CXX_STANDARD_REQUIRED:BOOL=${CMAKE_CXX_STANDARD_REQUIRED}
71+
-DCMAKE_CXX_EXTENSIONS:BOOL=${CMAKE_CXX_EXTENSIONS}
72+
# Dependencies
73+
-DSlicer_DIR:PATH=${Slicer_INNER_BUILD_DIR}
74+
# Options
75+
-D${proj}_BUILD_SLICER_EXTENSION:BOOL=ON
76+
-DBUILD_TESTING:BOOL=OFF
77+
DEPENDS
78+
${${proj}_DEPENDENCIES}
79+
)
80+
81+
list(APPEND ${APPLICATION_NAME}_EXTENSION_CPACK_PACKAGE_DIRS
82+
${${proj}_PACKAGE_DIR}/_CPack_Packages
83+
)
84+
else()
85+
ExternalProject_Add_Empty(${proj} DEPENDS ${${proj}_DEPENDENCIES})
86+
endif()

SuperBuild/SlicerPackageExtensions.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ set(proj SlicerPackageExtensions)
2828
set(${proj}_EXTENSIONS
2929
SPHARM-PDM
3030
ShapePopulationViewer
31+
shape4D
3132
ShapeRegressionExtension
3233
)
3334

0 commit comments

Comments
 (0)