Commit 82fcf0ad authored by jcfr's avatar jcfr

STYLE: Set Slicer_APPLICATIONS_DIR in SlicerApplicationOptions

git-svn-id: http://svn.slicer.org/Slicer4/trunk@26530 3bd1e089-480b-0410-8dfb-8563597acbee
parent 6a25f423
......@@ -77,3 +77,11 @@ endif()
mark_as_advanced(Slicer_DISCLAIMER_AT_STARTUP)
mark_as_superbuild(Slicer_DISCLAIMER_AT_STARTUP)
message(STATUS "Configuring ${Slicer_MAIN_PROJECT_APPLICATION_NAME} text of disclaimer at startup [${Slicer_DISCLAIMER_AT_STARTUP}]")
#-----------------------------------------------------------------------------
# Applications directory
#-----------------------------------------------------------------------------
if(NOT DEFINED Slicer_APPLICATIONS_DIR)
set(Slicer_APPLICATIONS_DIR "Applications")
endif()
mark_as_superbuild(Slicer_APPLICATIONS_DIR:PATH)
......@@ -1028,14 +1028,10 @@ set(Slicer_GUI_LIBRARY qSlicerBaseQTApp)
add_subdirectory(Modules/Core)
add_subdirectory(Base/QTApp)
add_subdirectory(Modules)
if (NOT Slicer_APPLICATIONS_DIR)
add_subdirectory(Applications)
else()
add_subdirectory(${Slicer_APPLICATIONS_DIR}
${CMAKE_CURRENT_BINARY_DIR}/Applications
)
endif()
add_subdirectory(
${Slicer_APPLICATIONS_DIR}
${CMAKE_CURRENT_BINARY_DIR}/Applications
)
#-----------------------------------------------------------------------------
set(Slicer_USE_FILE ${Slicer_BINARY_DIR}/UseSlicer.cmake)
......
......@@ -433,7 +433,6 @@ ExternalProject_Add(${proj}
-D${Slicer_MAIN_PROJECT_APPLICATION_NAME}_VERSION_PATCH:STRING=${${Slicer_MAIN_PROJECT_APPLICATION_NAME}_VERSION_PATCH}
-DSlicer_FORCED_WC_LAST_CHANGED_DATE:STRING=${Slicer_FORCED_WC_LAST_CHANGED_DATE}
-DSlicer_FORCED_WC_REVISION:STRING=${Slicer_FORCED_WC_REVISION}
-DSlicer_APPLICATIONS_DIR:PATH=${Slicer_APPLICATIONS_DIR}
-DSlicer_EXTENSION_SOURCE_DIRS:STRING=${Slicer_EXTENSION_SOURCE_DIRS}
-DSlicer_EXTENSION_INSTALL_DIRS:STRING=${Slicer_EXTENSION_INSTALL_DIRS}
-DExternalData_OBJECT_STORES:PATH=${ExternalData_OBJECT_STORES}
......
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