Pantyhose-X
/
vengi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMAKE: fixed update-libs target to use absolute paths

master
Martin Gerhardy 2018-09-06 18:07:09 +02:00
parent 751bd5b1f8
commit 6e66a5acd9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -169,7 +169,7 @@ macro(engine_update_git_lib)
cmake_parse_arguments(UPDATE "${_OPTIONS_ARGS}" "${_ONE_VALUE_ARGS}" "${_MULTI_VALUE_ARGS}" ${ARGN} )
if (NOT UPDATE_TARGETDIR)
set(UPDATE_TARGETDIR "contrib/libs/${UPDATE_LIB}")
set(UPDATE_TARGETDIR "${ROOT_DIR}/contrib/libs/${UPDATE_LIB}")
endif()
if (GIT_EXECUTABLE)
@ -206,8 +206,8 @@ macro(engine_update_git_lib)
endmacro()
engine_update_git_lib(LIB simplecpp URL "https://github.com/danmar/simplecpp.git" COPY simplecpp.cpp simplecpp.h)
engine_update_git_lib(LIB nuklear URL "https://github.com/danmar/simplecpp.git" COPY simplecpp.cpp simplecpp.h TARGETDIR src/modules/ui/nuklear/private)
engine_update_git_lib(LIB nuklear URL "https://github.com/danmar/simplecpp.git" COPY simplecpp.cpp simplecpp.h TARGETDIR ${ROOT_DIR}/src/modules/ui/nuklear/private)
# TODO cp $(UPDATEDIR)/nuklear.sync/demo/overview.c src/tests/testnuklear
engine_update_git_lib(LIB json URL "https://github.com/nlohmann/json.git" COPY src/json.hpp TARGETDIR src/modules/core)
engine_update_git_lib(LIB stringview URL "https://github.com/satoren/string_view.git" COPY string_view.hpp TARGETDIR contrib/libs/string_view)
engine_update_git_lib(LIB voxelizer URL "https://github.com/karimnaaji/voxelizer.git" COPY voxelizer.h TARGETDIR src/tools/voxedit/ui/editorscene/)
engine_update_git_lib(LIB json URL "https://github.com/nlohmann/json.git" COPY src/json.hpp TARGETDIR ${ROOT_DIR}/src/modules/core)
engine_update_git_lib(LIB stringview URL "https://github.com/satoren/string_view.git" COPY string_view.hpp TARGETDIR ${ROOT_DIR}/contrib/libs/string_view)
engine_update_git_lib(LIB voxelizer URL "https://github.com/karimnaaji/voxelizer.git" COPY voxelizer.h TARGETDIR ${ROOT_DIR}/src/tools/voxedit/ui/editorscene/)