Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CMake] avoid complete recompilation and patchs problems (on mac for instance) #781

Merged
merged 6 commits into from
Nov 4, 2020
Merged

[CMake] avoid complete recompilation and patchs problems (on mac for instance) #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8ffadea
[Patchs] avoid compilation err applying patchs twice
mathildemerle Oct 29, 2020
de8167e
[patches] build_always 0 for patches
Oct 30, 2020
106c125
[DCMTK] test ep_source_dir
mathildemerle Nov 2, 2020
7381d63
[DCMTK] build_always 0
mathildemerle Nov 2, 2020
b42de58
[extproj] add if ep_source_dir for all
mathildemerle Nov 3, 2020
49577fc
[CMake] rm ep_source_dir on master branches, mv BUILD_ALW in other PR
mathildemerle Nov 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion superbuild/external_projects_tools/EP_GeneratePatchCommand.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ function(ep_GeneratePatchCommand ep OutVar)
endif()
endforeach()

set(PATCH_COMMAND)
set(PATCH_COMMAND "")
if (NOT "${PATCHES_TO_APPLY}" STREQUAL "")
set(PATCH_COMMAND ${GIT_BIN} apply --ignore-whitespace ${PATCHES_TO_APPLY})
endif()
Expand Down
11 changes: 6 additions & 5 deletions superbuild/projects_modules/DCMTK.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,13 @@ EP_Initialisation(${ep}
if (NOT USE_SYSTEM_${ep})

## #############################################################################
## Set up versioning control.
## Set up versioning control
## #############################################################################

set(git_url git://git.dcmtk.org/dcmtk.git)
set(git_tag DCMTK-3.6.2)
if (NOT DEFINED ${ep}_SOURCE_DIR)
set(git_url git://git.dcmtk.org/dcmtk.git)
set(git_tag DCMTK-3.6.2)
endif()

## #############################################################################
## Check if patch has to be applied
Expand Down Expand Up @@ -104,7 +106,7 @@ ExternalProject_Add(${ep}
BINARY_DIR ${build_path}
TMP_DIR ${tmp_path}
STAMP_DIR ${stamp_path}

GIT_REPOSITORY ${git_url}
GIT_TAG ${git_tag}
PATCH_COMMAND ${${ep}_PATCH_COMMAND}
Expand All @@ -123,7 +125,6 @@ ExternalProject_Add(${ep}
ExternalProject_Get_Property(${ep} binary_dir)
set(${ep}_DIR ${binary_dir} PARENT_SCOPE)


endif() #NOT USE_SYSTEM_ep

endfunction()
11 changes: 5 additions & 6 deletions superbuild/projects_modules/ITK.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,13 @@ EP_Initialisation(${ep}
if (NOT USE_SYSTEM_${ep})

## #############################################################################
## Set up versioning control.
## Set up versioning control
## #############################################################################

set(git_url ${GITHUB_PREFIX}InsightSoftwareConsortium/ITK.git)
set(git_tag v5.0.0)
if (NOT DEFINED ${ep}_SOURCE_DIR)
set(git_url ${GITHUB_PREFIX}InsightSoftwareConsortium/ITK.git)
set(git_tag v5.0.0)
endif()

## #############################################################################
## Add specific cmake arguments for configuration step of the project
Expand Down Expand Up @@ -99,16 +101,13 @@ ExternalProject_Add(${ep}
BUILD_ALWAYS 1
)


## #############################################################################
## Set variable to provide infos about the project
## #############################################################################

ExternalProject_Get_Property(ITK binary_dir)
set(${ep}_DIR ${binary_dir} PARENT_SCOPE)



endif() #NOT USE_SYSTEM_ep

endfunction()
10 changes: 4 additions & 6 deletions superbuild/projects_modules/LogDemons.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,11 @@ EP_Initialisation(${ep}

if (NOT USE_SYSTEM_${ep})
## #############################################################################
## Set up versioning control.
## Set up versioning control
## #############################################################################

set(git_url ${GITHUB_PREFIX}Inria-Asclepios/LCC-LogDemons.git)
set(git_tag master)

set(git_url ${GITHUB_PREFIX}Inria-Asclepios/LCC-LogDemons.git)
set(git_tag master)

## #############################################################################
## Add specific cmake arguments for configuration step of the project
Expand Down Expand Up @@ -92,10 +91,9 @@ ExternalProject_Add(${ep}
CMAKE_ARGS ${cmake_args}
DEPENDS ${${ep}_dependencies}
INSTALL_COMMAND ""
BUILD_ALWAYS 1
BUILD_ALWAYS 1
)


## #############################################################################
## Set variable to provide infos about the project
## #############################################################################
Expand Down
4 changes: 2 additions & 2 deletions superbuild/projects_modules/QtDCM.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ EP_Initialisation(${ep}
if (NOT USE_SYSTEM_${ep})

## #############################################################################
## Set up versioning control.
## Set up versioning control
## #############################################################################

set(git_url ${GITHUB_PREFIX}medInria/qtdcm.git)
set(git_tag APHP)
set(git_tag APHP)

## #############################################################################
## Add specific cmake arguments for configuration step of the project
Expand Down
11 changes: 6 additions & 5 deletions superbuild/projects_modules/RPI.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,13 @@ EP_Initialisation(${ep}
if (NOT USE_SYSTEM_${ep})

## #############################################################################
## Set up versioning control.
## Set up versioning control
## #############################################################################

set(git_url ${GITHUB_PREFIX}Inria-Asclepios/RPI.git)
set(git_tag ITK5.0)
if (NOT DEFINED ${ep}_SOURCE_DIR)
set(git_url ${GITHUB_PREFIX}Inria-Asclepios/RPI.git)
set(git_tag ITK5.0)
endif()

## #############################################################################
## Add specific cmake arguments for configuration step of the project
Expand Down Expand Up @@ -91,8 +93,7 @@ ExternalProject_Add(${ep}
DEPENDS ${${ep}_dependencies}
INSTALL_COMMAND ""
BUILD_ALWAYS 1
)

)

## #############################################################################
## Set variable to provide infos about the project
Expand Down
10 changes: 4 additions & 6 deletions superbuild/projects_modules/TTK.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ EP_Initialisation(${ep}
)

if (NOT USE_SYSTEM_${ep})

## #############################################################################
## Set up versioning control.
## Set up versioning control
## #############################################################################

set(git_url ${GITHUB_PREFIX}Inria-Asclepios/TTK-Public.git)
set(git_tag master)


## #############################################################################
## Add specific cmake arguments for configuration step of the project
## #############################################################################
Expand Down Expand Up @@ -91,17 +91,15 @@ ExternalProject_Add(${ep}
CMAKE_ARGS ${cmake_args}
DEPENDS ${${ep}_dependencies}
INSTALL_COMMAND ""
BUILD_ALWAYS 1
)

BUILD_ALWAYS 1
)

## #############################################################################
## Set variable to provide infos about the project
## #############################################################################

ExternalProject_Get_Property(${ep} binary_dir)
set(${ep}_DIR ${binary_dir} PARENT_SCOPE)


endif() #NOT USE_SYSTEM_ep

Expand Down
8 changes: 5 additions & 3 deletions superbuild/projects_modules/VTK.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,13 @@ EP_Initialisation(${ep}
if (NOT USE_SYSTEM_${ep})

## #############################################################################
## Set up versioning control.
## Set up versioning control
## #############################################################################

set(git_url ${GITHUB_PREFIX}Kitware/VTK.git)
set(git_tag v8.1.2)
if (NOT DEFINED ${ep}_SOURCE_DIR)
set(git_url ${GITHUB_PREFIX}Kitware/VTK.git)
set(git_tag v8.1.2)
endif()

## #############################################################################
## Add specific cmake arguments for configuration step of the project
Expand Down
11 changes: 5 additions & 6 deletions superbuild/projects_modules/dtk.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,13 @@ EP_Initialisation(${ep}
if (NOT USE_SYSTEM_${ep})

## #############################################################################
## Set up versioning control.
## Set up versioning control
## #############################################################################

set(git_url ${GITLAB_INRIA_PREFIX}dtk/dtk.git)
set(git_tag 1.7.1)

if (NOT DEFINED ${ep}_SOURCE_DIR)
set(git_url ${GITLAB_INRIA_PREFIX}dtk/dtk.git)
set(git_tag 1.7.1)
endif()

## #############################################################################
## Add specific cmake arguments for configuration step of the project
Expand Down Expand Up @@ -81,7 +82,6 @@ set(cmake_args
-DQt5_DIR=${Qt5_DIR}
)


## #############################################################################
## Add external-project
## #############################################################################
Expand All @@ -105,7 +105,6 @@ ExternalProject_Add(${ep}
BUILD_ALWAYS 1
)


## #############################################################################
## Set variable to provide infos about the project
## #############################################################################
Expand Down
4 changes: 1 addition & 3 deletions superbuild/projects_modules/dtkImaging.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,12 @@ EP_Initialisation(${ep}
if (NOT USE_SYSTEM_${ep})

## #############################################################################
## Set up versioning control.
## Set up versioning control
## #############################################################################

set(git_url ${GITLAB_INRIA_PREFIX}dtk/dtk-imaging.git)
set(git_tag master)


## #############################################################################
## Add specific cmake arguments for configuration step of the project
## #############################################################################
Expand Down Expand Up @@ -94,7 +93,6 @@ ExternalProject_Add(${ep}
BUILD_ALWAYS 1
)


## #############################################################################
## Set variable to provide infos about the project
## #############################################################################
Expand Down
2 changes: 1 addition & 1 deletion superbuild/projects_modules/ffmpeg.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ EP_Initialisation(${ep}
if (NOT USE_SYSTEM_${ep})

## #############################################################################
## Define repository where get the sources
## Set up versioning control
## #############################################################################

if (NOT DEFINED ${ep}_SOURCE_DIR)
Expand Down