mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #2617: Removed MacPorts from CMake (default) search path.

Browse Source
This commit is contained in:
Armin Novak 2018-05-14 10:39:12 +02:00
parent 7eb12bb028
commit 3c7dfa0a03
3 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -560,11 +560,6 @@ if(APPLE)
if(NOT DEFINED CMAKE_OSX_ARCHITECTURES) if(NOT DEFINED CMAKE_OSX_ARCHITECTURES)
set(CMAKE_OSX_ARCHITECTURES i386 x86_64) set(CMAKE_OSX_ARCHITECTURES i386 x86_64)
endif() endif()
if(IS_DIRECTORY /opt/local/include)
include_directories(/opt/local/include)
link_directories(/opt/local/lib)
endif()
endif(IOS) endif(IOS)
# Temporarily disabled, causes the cmake script to be reexecuted, causing the compilation to fail. # Temporarily disabled, causes the cmake script to be reexecuted, causing the compilation to fail.

3
cmake/FindUUID.cmake
View File

@ -37,7 +37,6 @@ else (UUID_LIBRARIES AND UUID_INCLUDE_DIRS)
/usr/include /usr/include
/usr/include/gdal /usr/include/gdal
/sw/include # Fink /sw/include # Fink
/opt/local/include # DarwinPorts
/opt/csw/include # Blastwave /opt/csw/include # Blastwave
/opt/include /opt/include
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
@ -61,7 +60,6 @@ else (UUID_LIBRARIES AND UUID_INCLUDE_DIRS)
/usr/local/lib /usr/local/lib
/usr/lib /usr/lib
/sw/lib /sw/lib
/opt/local/lib
/opt/csw/lib /opt/csw/lib
/opt/lib /opt/lib
/usr/freeware/lib64 /usr/freeware/lib64
@ -84,7 +82,6 @@ else (UUID_LIBRARIES AND UUID_INCLUDE_DIRS)
/usr/local/lib /usr/local/lib
/usr/lib /usr/lib
/sw/lib /sw/lib
/opt/local/lib
/opt/csw/lib /opt/csw/lib
/opt/lib /opt/lib
/usr/freeware/lib64 /usr/freeware/lib64

2
cmake/Findlibusb-1.0.cmake
View File

@ -53,7 +53,6 @@ libusb.h
PATHS PATHS
/usr/include /usr/include
/usr/local/include /usr/local/include
/opt/local/include
/sw/include /sw/include
PATH_SUFFIXES PATH_SUFFIXES
libusb-1.0 libusb-1.0
@ -65,7 +64,6 @@ libusb-1.0
PATHS PATHS
/usr/lib /usr/lib
/usr/local/lib /usr/local/lib
/opt/local/lib
/sw/lib /sw/lib
) )