Commit 4abad41a authored by jcfr's avatar jcfr
Browse files

COMP: CMakeLists.txt - Loop though the Modules/XXX/Logic only if Slicer is...

COMP: CMakeLists.txt - Loop though the Modules/XXX/Logic only if Slicer is build with Slicer3_USE_KWWIDGETS OFF

That means that the Logic subdirectory should be included in the CMakeLists.txt
specigic to the Module.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@11913 3bd1e089-480b-0410-8dfb-8563597acbee
parent 6885eea6
......@@ -494,13 +494,15 @@ slicer3_get_persistent_property(Slicer3_Base_INCLUDE_DIRS Slicer3_Base_INCLUDE_D
INCLUDE("${Slicer3_CMAKE_DIR}/Slicer3ModuleLogicMacros.cmake")
# Loop through Modules subdirectory and try to include Logic subdirectory if it exists
FILE(GLOB modules_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} Modules/*)
FOREACH(subdir ${modules_subdirs})
IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${subdir}/Logic)
ADD_SUBDIRECTORY(${subdir}/Logic)
ENDIF()
ENDFOREACH()
IF (NOT Slicer3_USE_KWWIDGETS)
# Loop through Modules subdirectory and try to include Logic subdirectory if it exists
FILE(GLOB modules_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} Modules/*)
FOREACH(subdir ${modules_subdirs})
IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${subdir}/Logic)
ADD_SUBDIRECTORY(${subdir}/Logic)
ENDIF()
ENDFOREACH()
ENDIF()
#-----------------------------------------------------------------------------
......
......@@ -17,9 +17,8 @@ endif(NOT Slicer3_SOURCE_DIR)
# --------------------------------------------------------------------------
# Warning - Do not include Logic subdirectory - This has been done in Slicer3/CMakeLists.txt
SET(Tractography_libs
Logic
Seeding
Settings
Display
......
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