Fix compilation using cmake 2.8.12 for now. Closes #1350

This commit is contained in:
baldurk
2019-04-11 12:57:41 +01:00
parent 300fe403c2
commit 09b5b5df8c
+3 -2
View File
@@ -204,7 +204,6 @@ set(sources
3rdparty/zstd/huf.h
3rdparty/zstd/huf_compress.c
3rdparty/zstd/huf_decompress.c
3rdparty/zstd/LICENSE
3rdparty/zstd/mem.h
3rdparty/zstd/pool.c
3rdparty/zstd/pool.h
@@ -384,9 +383,11 @@ if(UNIX)
COMMAND ${HOST_NATIVE_CPP_COMPILER} 3rdparty/include-bin/main.cpp -o ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin
DEPENDS 3rdparty/include-bin/main.cpp)
set(INCLUDE_BIN_EXE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin")
set(INCLUDE_BIN_DEP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin")
else()
add_executable(include-bin 3rdparty/include-bin/main.cpp)
set(INCLUDE_BIN_EXE $<TARGET_FILE:include-bin>)
set(INCLUDE_BIN_DEP include-bin)
endif()
foreach(res ${data})
@@ -399,7 +400,7 @@ if(UNIX)
WORKING_DIRECTORY ${working_dir}
COMMAND ${CMAKE_COMMAND} -E make_directory ${out_src_dir}
COMMAND ${INCLUDE_BIN_EXE} ${in} ${out_src}
DEPENDS ${INCLUDE_BIN_EXE}
DEPENDS ${INCLUDE_BIN_DEP}
DEPENDS ${res})
list(APPEND data_objects ${out_src})