Commit a1d60e37 authored by jcfr's avatar jcfr

COMP: Ensure CMake options can be overwritten during initial configuration

The file "SlicerOverwriteDefaultOptions.cmake" was included after defining
dependent options. It means that CMake option depending on
overwritten value were properly set only after a second configuration.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@20661 3bd1e089-480b-0410-8dfb-8563597acbee
parent 247509c7
......@@ -65,6 +65,14 @@ endif()
include(PreventInSourceBuilds)
include(PreventInBuildInstalls)
#-----------------------------------------------------------------------------
# Overwrite default options
#-----------------------------------------------------------------------------
set(_overwrite_options_file ${Slicer_CMAKE_DIR}/SlicerOverwriteDefaultOptions.cmake)
if(EXISTS ${_overwrite_options_file})
include(${_overwrite_options_file})
endif()
#-----------------------------------------------------------------------------
# Set a default build type if none was specified
#-----------------------------------------------------------------------------
......@@ -282,13 +290,6 @@ mark_as_advanced(DOCUMENTATION_ARCHIVES_OUTPUT_DIRECTORY)
# Attempt to discover Doxygen so that DOXYGEN_EXECUTABLE is set to an appropriate default value
find_package(Doxygen QUIET)
#-----------------------------------------------------------------------------
# Overwrite default options
set(_overwrite_options_file ${Slicer_CMAKE_DIR}/SlicerOverwriteDefaultOptions.cmake)
if(EXISTS ${_overwrite_options_file})
include(${_overwrite_options_file})
endif()
#-----------------------------------------------------------------------------
# CTestCustom
#-----------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment