improve CMakeLists.txt

wojdyr · Jan 19, 2021 · 94ff368 · 94ff368
1 parent 5f174e7
commit 94ff368
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
     - uses: actions/checkout@v2
     - name: dependencies
       run: |
-        sudo apt-get install g++ libz-dev libboost-dev libwxgtk3.0-gtk3-dev swig libxy-dev liblua5.3-dev
+        sudo apt-get install g++ libz-dev libboost-dev libwxgtk3.0-gtk3-dev swig libxy-dev liblua5.3-dev lua5.3
         curl -LsS -o tests/catch.hpp https://github.com/philsquared/Catch/releases/download/v1.10.0/catch.hpp
     - name: build
       run: |
@@ -37,13 +37,13 @@ jobs:
     - uses: actions/checkout@v2
     - name: dependencies
       run: |
-        sudo apt-get install clang-3.5 cmake libz-dev libxy-dev libboost-dev liblua5.2-dev
+        sudo apt-get install clang-3.5 cmake libz-dev libxy-dev libboost-dev liblua5.2-dev lua5.2
     - name: build
       run: |
         $CXX --version
         cmake --version
-        cmake .
-        make -j2
+        cmake . -DDOWNLOAD_XYLIB=OFF -DDOWNLOAD_LUA=OFF -DDOWNLOAD_ZLIB=OFF
+        make
         sudo make install
     - name: test
       run: |

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -164,7 +164,8 @@ if (DOWNLOAD_XYLIB)
   set(XY_LIBRARY "${THIRDPARTY_INSTALL}/lib/${LIB_PREFIX}xy${LIB_SUFFIX}")
   set(XY_INCLUDE_DIR "${THIRDPARTY_INSTALL}/include")
 else()
-  set(XY_LIBRARY xy)
+  find_path(XY_INCLUDE_DIR xylib/xylib.h HINTS ${CMAKE_INSTALL_PREFIX}/include)
+  find_library(XY_LIBRARY NAMES xy HINTS ${LIB_INSTALL_DIR})
 endif()
 include_directories("${XY_INCLUDE_DIR}")