diff options
| author | Adam <adam@sigterm.info> | 2015-09-06 16:03:58 -0400 |
|---|---|---|
| committer | Adam <adam@sigterm.info> | 2015-09-06 16:03:58 -0400 |
| commit | 132932ffafb91db84a3661890dd31376ba759923 (patch) | |
| tree | e58688743339a2b32b088ec53b3b044461d809bd | |
| parent | c007b829f7767b5b836ea32ffe7d6bf8afe5d704 (diff) | |
| parent | 389c1dbd9282254cb1ccd7b616862901841a98f8 (diff) | |
Merge pull request #134 from retsofaj/2.0
Have CMake first check for libraries in any additional locations
| -rw-r--r-- | cmake/Anope.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/Anope.cmake b/cmake/Anope.cmake index 4c71d132c..f93384cc0 100644 --- a/cmake/Anope.cmake +++ b/cmake/Anope.cmake @@ -449,7 +449,8 @@ macro(calculate_libraries SRC SRC_LDFLAGS EXTRA_DEPENDS) if(DEFAULT_LIBRARY_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR}) find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} PATHS ${DEFAULT_LIBRARY_DIRS} ${WSDK_PATH}/lib $ENV{VCINSTALLDIR}/lib ${EXTRA_INCLUDE} ${EXTRA_LIBS}) else(DEFAULT_LIBRARY_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR}) - find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} ${EXTRA_INCLUDE} ${EXTRA_LIBS}) + find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} PATHS ${EXTRA_INCLUDE} ${EXTRA_LIBS} NO_DEFAULT_PATH) + find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} PATHS ${EXTRA_INCLUDE} ${EXTRA_LIBS}) endif(DEFAULT_LIBRARY_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR}) # If the library was found, we will add it to the linker flags if(FOUND_${LIBRARY}_LIBRARY) |