Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 538278
Collapse All | Expand All

(-)a/channels/CMakeLists.txt (-2 / +2 lines)
Lines 253-260 set(FILENAME "ChannelOptions.cmake") Link Here
253 
file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}")
 253 
file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}")
254 

          254
          

        

        

          255
          
foreach(FILEPATH ${FILEPATHS})

          255
          
foreach(FILEPATH ${FILEPATHS})

        

          
            

              256
              
	if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}")


              256
              
	if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}")

            

            

              257
              
		string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" DIR ${FILEPATH})


              257
              
		string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" DIR ${FILEPATH})

            

        

          258
          
		set(CHANNEL_OPTION)

          258
          
		set(CHANNEL_OPTION)

        

        

          259
          
		include(${FILEPATH})

          259
          
		include(${FILEPATH})

        

        

          260
          
		if(${CHANNEL_OPTION})

          260
          
		if(${CHANNEL_OPTION})

        



(-)a/channels/client/CMakeLists.txt
      (+2 lines)




  

    
      
            Lines 24-30
          set(${MODULE_PREFIX}_SRCS
      
      
        Link Here
      
    
  

        

          24
          
	${CMAKE_CURRENT_SOURCE_DIR}/addin.c

          24
          
	${CMAKE_CURRENT_SOURCE_DIR}/addin.c

        

        

          25
          
	${CMAKE_CURRENT_SOURCE_DIR}/addin.h)

          25
          
	${CMAKE_CURRENT_SOURCE_DIR}/addin.h)

        

        

          26
          

          26
          

        

            

              
              
              27
              
if(CHANNEL_STATIC_CLIENT_ENTRIES)

            

        

          27
          
list(REMOVE_DUPLICATES CHANNEL_STATIC_CLIENT_ENTRIES)

          28
          
list(REMOVE_DUPLICATES CHANNEL_STATIC_CLIENT_ENTRIES)

        

            

              
              
              29
              
endif()

            

        

          28
          

          30
          

        

        

          29
          
foreach(STATIC_ENTRY ${CHANNEL_STATIC_CLIENT_ENTRIES})

          31
          
foreach(STATIC_ENTRY ${CHANNEL_STATIC_CLIENT_ENTRIES})

        

        

          30
          
	foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES})

          32
          
	foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES})

        



(-)a/third-party/CMakeLists.txt
      (-3 / +3 lines)




  

    
      
            Lines 22-32
          
      
      
        Link Here
      
    
  

        

          22
          
file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt")

          22
          
file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt")

        

        

          23
          

          23
          

        

        

          24
          
foreach(dir ${all_valid_subdirs})

          24
          
foreach(dir ${all_valid_subdirs})

        

          
            

              25
              
	if(${dir} MATCHES "^([^/]*)//CMakeLists.txt")


              25
              
	if(${dir} MATCHES "^([^/]*)/+CMakeLists.txt")

            

            

              26
              
		string(REGEX REPLACE "^([^/]*)//CMakeLists.txt" "\\1" dir_trimmed ${dir})


              26
              
		string(REGEX REPLACE "^([^/]*)/+CMakeLists.txt" "\\1" dir_trimmed ${dir})

            

        

          27
          
		message(STATUS "Adding third-party component ${dir_trimmed}")

          27
          
		message(STATUS "Adding third-party component ${dir_trimmed}")

        

        

          28
          
		add_subdirectory(${dir_trimmed})

          28
          
		add_subdirectory(${dir_trimmed})

        

        

          29
          
	endif()

          29
          
	endif()

        

        

          30
          
endforeach(dir)

          30
          
endforeach(dir)

        

        

          31
          

          31
          

        

          
            

              32
              
set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE)


              32
              
set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE)

            






  

  Return to bug 538278