Merge pull request #12 from SuperSandro2000/master

Changed lz4 path to var
This commit is contained in:
Jeremy Rimpo
2018-03-08 16:47:11 -06:00
committed by GitHub
3 changed files with 6 additions and 2 deletions
+4
View File
@@ -2,3 +2,7 @@ CMakeLists.txt.user
edit
build
std*.log
build
vsbuild
vs_stderr.log
vs_stdout.log
+1 -1
View File
@@ -8,7 +8,7 @@ SET(DEPENDENCIES_DIR CACHE PATH "")
# hint to find qt in dependencies path
LIST(APPEND CMAKE_PREFIX_PATH ${QT_ROOT}/lib/cmake)
LIST(APPEND CMAKE_PREFIX_PATH ${DEPENDENCIES_DIR}/lz4/dll)
LIST(APPEND CMAKE_PREFIX_PATH ${LZ4_ROOT}/dll)
FILE(GLOB_RECURSE BOOST_ROOT ${DEPENDENCIES_DIR}/boost*/project-config.jam)
GET_FILENAME_COMPONENT(BOOST_ROOT ${BOOST_ROOT} DIRECTORY)
+1 -1
View File
@@ -39,7 +39,7 @@ INCLUDE_DIRECTORIES(${project_path}/uibase/src
${project_path}/game_gamebryo/src)
LINK_DIRECTORIES(${project_path}/uibase/build/src
${lib_path}
${project_path}/../lz4/dll)
${LZ4_ROOT}/dll)
ADD_LIBRARY(${PROJ_NAME} SHARED ${${PROJ_NAME}_HDRS} ${${PROJ_NAME}_SRCS} ${${PROJ_NAME}_UIHDRS} ${${PROJ_NAME}_RCCPPS} ${${PROJ_NAME}_translations_qm})