Commit 2c6476cd authored by jcfr's avatar jcfr
Browse files

COMP: Slicer_Libs_{LIBRARIES, INCLUDE_DIRS} are now set only in Libs/CMakeLists.txt

git-svn-id: http://svn.slicer.org/Slicer4/trunk@16470 3bd1e089-480b-0410-8dfb-8563597acbee
parent ebb42567
...@@ -270,11 +270,9 @@ ENDIF() ...@@ -270,11 +270,9 @@ ENDIF()
# Slicer include and libraries subdirectory # Slicer include and libraries subdirectory
# #
SET(Slicer_Libs_LIBRARIES CACHE INTERNAL "Slicer Libs libraries" FORCE)
SET(Slicer_Base_LIBRARIES CACHE INTERNAL "Slicer Base libraries" FORCE) SET(Slicer_Base_LIBRARIES CACHE INTERNAL "Slicer Base libraries" FORCE)
SET(Slicer_ModuleLogic_LIBRARIES CACHE INTERNAL "Slicer Module logic libraries" FORCE) SET(Slicer_ModuleLogic_LIBRARIES CACHE INTERNAL "Slicer Module logic libraries" FORCE)
SET(Slicer_Libs_INCLUDE_DIRS CACHE INTERNAL "Slicer Libs includes" FORCE)
SET(Slicer_Base_INCLUDE_DIRS CACHE INTERNAL "Slicer Base includes" FORCE) SET(Slicer_Base_INCLUDE_DIRS CACHE INTERNAL "Slicer Base includes" FORCE)
SET(Slicer_ModuleLogic_INCLUDE_DIRS CACHE INTERNAL "Slicer Module logic includes" FORCE) SET(Slicer_ModuleLogic_INCLUDE_DIRS CACHE INTERNAL "Slicer Module logic includes" FORCE)
......
...@@ -78,10 +78,10 @@ STRING(REPLACE MRMLIDImageIO MRMLIDIO libs "${libs}") ...@@ -78,10 +78,10 @@ STRING(REPLACE MRMLIDImageIO MRMLIDIO libs "${libs}")
LIST(REMOVE_ITEM libs SlicerExecutionModel) # Not a library LIST(REMOVE_ITEM libs SlicerExecutionModel) # Not a library
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Update variable Slicer_Libs_LIBRARIES and Slicer_Libs_INCLUDE_DIRS # Set variable Slicer_Libs_LIBRARIES and Slicer_Libs_INCLUDE_DIRS
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
SET(Slicer_Libs_LIBRARIES ${Slicer_Libs_LIBRARIES} ${libs} CACHE INTERNAL "Slicer Libs libraries" FORCE) SET(Slicer_Libs_LIBRARIES ${libs} CACHE INTERNAL "Slicer Libs libraries" FORCE)
SET(Slicer_Libs_INCLUDE_DIRS ${Slicer_Libs_INCLUDE_DIRS} ${include_dirs} CACHE INTERNAL "Slicer Libs includes" FORCE) SET(Slicer_Libs_INCLUDE_DIRS ${include_dirs} CACHE INTERNAL "Slicer Libs includes" FORCE)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Loop over list of directories # Loop over list of directories
......
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