fix cmake issues

This commit is contained in:
Valient Gough 2017-08-05 23:32:01 -07:00
parent 5f0806c5cc
commit addee4fa44
No known key found for this signature in database
GPG Key ID: 33C65E29813C14DF
2 changed files with 2 additions and 2 deletions

View File

@ -149,7 +149,7 @@ if (USE_INTERNAL_TINYXML)
add_subdirectory(${TINYXML_DIR}) add_subdirectory(${TINYXML_DIR})
include_directories(${CMAKE_CURRENT_LIST_DIR}/${TINYXML_DIR}) include_directories(${CMAKE_CURRENT_LIST_DIR}/${TINYXML_DIR})
link_directories(${CMAKE_BINARY_DIR}/${TINYXML_DIR}) link_directories(${CMAKE_BINARY_DIR}/${TINYXML_DIR})
set(TINYXML_LIBRARIES tinyxml2) set(TINYXML_LIBRARIES tinyxml2_static)
else () else ()
find_package (TinyXML REQUIRED) find_package (TinyXML REQUIRED)
include_directories (${TINYXML_INCLUDE_DIR}) include_directories (${TINYXML_INCLUDE_DIR})

View File

@ -2,4 +2,4 @@ set -x
set -e set -e
mkdir build mkdir build
cd build cd build
cmake -DCMAKE_INSTALL_PREFIX:PATH=/tmp/encfs -DCMAKE_BUILD_TYPE=Debug -DMINIGLOG=ON .. cmake -DCMAKE_INSTALL_PREFIX:PATH=/tmp/encfs -DCMAKE_BUILD_TYPE=Debug ..