Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 757513 | Differences between
and this patch

Collapse All | Expand All

(-)a/Modules/Platform/Darwin.cmake (-4 / +9 lines)
Lines 116-124 set(CMAKE_C_FRAMEWORK_SEARCH_FLAG -F) Link Here
116 
set(CMAKE_CXX_FRAMEWORK_SEARCH_FLAG -F)
 116 
set(CMAKE_CXX_FRAMEWORK_SEARCH_FLAG -F)
117 
set(CMAKE_Fortran_FRAMEWORK_SEARCH_FLAG -F)
 117 
set(CMAKE_Fortran_FRAMEWORK_SEARCH_FLAG -F)
118 

          118
          

        

          
            

              119
              
# default to searching for frameworks first


              119
              
# default to searching for frameworks last

            

        

          120
          
if(NOT DEFINED CMAKE_FIND_FRAMEWORK)

          120
          
if(NOT DEFINED CMAKE_FIND_FRAMEWORK)

        

          
            

              121
              
  set(CMAKE_FIND_FRAMEWORK FIRST)


              121
              
  set(CMAKE_FIND_FRAMEWORK LAST)

            

        

          122
          
endif()

          122
          
endif()

        

        

          123
          

          123
          

        

        

          124
          
# Older OS X linkers do not report their framework search path

          124
          
# Older OS X linkers do not report their framework search path

        

  

    
      
            Lines 140-145
          endif()
      
      
        Link Here
      
    
  

        

          140
          

          140
          

        

        

          141
          
# set up the default search directories for frameworks

          141
          
# set up the default search directories for frameworks

        

        

          142
          
set(CMAKE_SYSTEM_FRAMEWORK_PATH

          142
          
set(CMAKE_SYSTEM_FRAMEWORK_PATH

        

            

              
              
              143
              
  @GENTOO_PORTAGE_EPREFIX@MacOSX.sdk/System/Library/Frameworks

            

            

              144
              
  @GENTOO_PORTAGE_EPREFIX@Frameworks

            

            

              145
              
  @GENTOO_PORTAGE_EPREFIX@usr/lib

            

        

          143
          
  ~/Library/Frameworks

          146
          
  ~/Library/Frameworks

        

        

          144
          
  )

          147
          
  )

        

        

          145
          
if(_CMAKE_OSX_SYSROOT_PATH)

          148
          
if(_CMAKE_OSX_SYSROOT_PATH)

        

  

    
      
            Lines 186-198
          if(CMAKE_OSX_SYSROOT)
      
      
        Link Here
      
    
  

        

          186
          
  endif()

          189
          
  endif()

        

        

          187
          
endif()

          190
          
endif()

        

        

          188
          

          191
          

        

          
            

              189
              
# default to searching for application bundles first


              192
              
# default to searching for application bundles last

            

        

          190
          
if(NOT DEFINED CMAKE_FIND_APPBUNDLE)

          193
          
if(NOT DEFINED CMAKE_FIND_APPBUNDLE)

        

          
            

              191
              
  set(CMAKE_FIND_APPBUNDLE FIRST)


              194
              
  set(CMAKE_FIND_APPBUNDLE LAST)

            

        

          192
          
endif()

          195
          
endif()

        

        

          193
          
# set up the default search directories for application bundles

          196
          
# set up the default search directories for application bundles

        

        

          194
          
set(_apps_paths)

          197
          
set(_apps_paths)

        

        

          195
          
foreach(_path

          198
          
foreach(_path

        

            

              
              
              199
              
  @GENTOO_PORTAGE_EPREFIX@Applications

            

            

              200
              
  @GENTOO_PORTAGE_EPREFIX@usr/bin

            

        

          196
          
  "~/Applications"

          201
          
  "~/Applications"

        

        

          197
          
  "/Applications"

          202
          
  "/Applications"

        

        

          198
          
  "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+

          203
          
  "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+

        



(-)a/Modules/Platform/UnixPaths.cmake
      (-9 / +27 lines)




  

    
      
            Lines 23-29
          get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
      
      
        Link Here
      
    
  

        

          23
          
# search types.

          23
          
# search types.

        

        

          24
          
list(APPEND CMAKE_SYSTEM_PREFIX_PATH

          24
          
list(APPEND CMAKE_SYSTEM_PREFIX_PATH

        

        

          25
          
  # Standard

          25
          
  # Standard

        

          
            

              26
              
  /usr/local /usr /


              26
              
  @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@

            

            

              
              

              27
              
  @GENTOO_HOST@/usr/local /usr /

            

        

          27
          

          28
          

        

        

          28
          
  # CMake install location

          29
          
  # CMake install location

        

        

          29
          
  "${_CMAKE_INSTALL_DIR}"

          30
          
  "${_CMAKE_INSTALL_DIR}"

        

  

    
      
            Lines 50-66
          list(APPEND CMAKE_SYSTEM_PREFIX_PATH
      
      
        Link Here
      
    
  

        

          50
          

          51
          

        

        

          51
          
# List common include file locations not under the common prefixes.

          52
          
# List common include file locations not under the common prefixes.

        

        

          52
          
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH

          53
          
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH

        

          
            

              53
              
  # X11


              54
              
  @GENTOO_PORTAGE_EPREFIX@usr/include

            

            

              54
              
  /usr/include/X11


              
              
            

        

          55
          
  )

          55
          
  )

        

        

          56
          

          56
          

        

        

          57
          
list(APPEND CMAKE_SYSTEM_LIBRARY_PATH

          57
          
list(APPEND CMAKE_SYSTEM_LIBRARY_PATH

        

          
            

              58
              
  # X11


              58
              
  @GENTOO_PORTAGE_GCCLIBDIR@/gcc

            

            

              59
              
  /usr/lib/X11


              59
              
  @GENTOO_PORTAGE_GCCLIBDIR@

            

            

              
              

              60
              
  @GENTOO_PORTAGE_EPREFIX@usr/lib64

            

            


              61
              
  @GENTOO_PORTAGE_EPREFIX@usr/libx32

            

            


              62
              
  @GENTOO_PORTAGE_EPREFIX@usr/lib32

            

            


              63
              
  @GENTOO_PORTAGE_EPREFIX@usr/lib

            

            


              64
              
  @GENTOO_PORTAGE_EPREFIX@lib

            

            


              65
              
  )

            

            


              66
              

            

            


              67
              
list(APPEND CMAKE_SYSTEM_PROGRAM_PATH

            

            


              68
              
  @GENTOO_PORTAGE_EPREFIX@usr/bin

            

            


              69
              
  @GENTOO_PORTAGE_EPREFIX@bin

            

        

          60
          
  )

          70
          
  )

        

        

          61
          

          71
          

        

        

          62
          
list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES

          72
          
list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES

        

          
            

              63
              
  /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64


              73
              
  @GENTOO_PORTAGE_GCCLIBDIR@/gcc

            

            

              
              

              74
              
  @GENTOO_PORTAGE_GCCLIBDIR@

            

            


              75
              
  @GENTOO_PORTAGE_EPREFIX@usr/lib64

            

            


              76
              
  @GENTOO_PORTAGE_EPREFIX@usr/libx32

            

            


              77
              
  @GENTOO_PORTAGE_EPREFIX@usr/lib32

            

            


              78
              
  @GENTOO_PORTAGE_EPREFIX@usr/lib

            

            


              79
              
  @GENTOO_PORTAGE_EPREFIX@lib

            

            


              80
              
  @GENTOO_HOST@/lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32

            

        

          64
          
  )

          81
          
  )

        

        

          65
          

          82
          

        

        

          66
          
if(CMAKE_SYSROOT_COMPILE)

          83
          
if(CMAKE_SYSROOT_COMPILE)

        

  

    
      
            Lines 73-83
          endif()
      
      
        Link Here
      
    
  

        

          73
          
# parsing the implicit directory information from compiler output.

          90
          
# parsing the implicit directory information from compiler output.

        

        

          74
          
set(_CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES_INIT

          91
          
set(_CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES_INIT

        

        

          75
          
  ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}

          92
          
  ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}

        

          
            

              76
              
  "${_cmake_sysroot_compile}/usr/include"


              93
              
  @GENTOO_PORTAGE_EPREFIX@usr/include

            

            

              
              

              94
              
  @GENTOO_HOST@/usr/include

            

        

          77
          
  )

          95
          
  )

        

        

          78
          
set(_CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES_INIT

          96
          
set(_CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES_INIT

        

        

          79
          
  ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}

          97
          
  ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}

        

          
            

              80
              
  "${_cmake_sysroot_compile}/usr/include"


              98
              
  @GENTOO_PORTAGE_EPREFIX@usr/include

            

            

              
              

              99
              
  @GENTOO_HOST@/usr/include

            

        

          81
          
  )

          100
          
  )

        

        

          82
          
set(_CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES_INIT

          101
          
set(_CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES_INIT

        

        

          83
          
  ${CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES}

          102
          
  ${CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES}

        

            

              84
              
- 

              
              
            






  

  Return to bug 757513