Merge pull request #124 from zhihaoy/cmake-fixes

find_library(DL_LIBRARY dl) is wrong
ampl · Feb 8, 2019 · d305155 · d305155
2 parents 0e030e0 + b425c7d
commit d305155
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/asl/CMakeLists.txt b/src/asl/CMakeLists.txt
@@ -259,10 +259,7 @@ if (NOT HAVE_GETRUSAGE)
   target_compile_definitions(asl-extra PRIVATE NO_RUSAGE)
 endif ()
 
-find_library(DL_LIBRARY dl)
-if (DL_LIBRARY)
-  target_link_libraries(asl dl)
-endif ()
+target_link_libraries(asl ${CMAKE_DL_LIBS})
 
 find_package(MATLAB)
 if (MATLAB_FOUND)

diff --git a/support/travis-build.py b/support/travis-build.py
@@ -14,7 +14,7 @@
   travis = 'TRAVIS' in os.environ
   workdir = tempfile.mkdtemp()
   try:
-    doxygen_url = 'http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.10.linux.bin.tar.gz'
+    doxygen_url = 'http://ftp.kaist.ac.kr/doxygen/doxygen-1.8.10.linux.bin.tar.gz'
     dir = os.path.dirname(os.path.realpath(__file__))
     with Downloader().download(doxygen_url) as f:
       with closing(tarfile.open(f, 'r:gz')) as archive: