Starting from 2021-07-01, all LRZ GitLab users will be required to explicitly accept the GitLab Terms of Service. Please see the detailed information at https://doku.lrz.de/display/PUBLIC/GitLab and make sure that your projects conform to the requirements.

Commit 1088ad2a authored by schultezub's avatar schultezub
Browse files

fixed cmake macros

git-svn-id: https://camplinux.in.tum.de/svn/campvis/trunk@178 bb408c1c-ae56-11e1-83d9-df6b3e0c105e
parent c56d5c41
......@@ -18,7 +18,7 @@ ENDMACRO(LIST_SUBDIRECTORIES)
MACRO(COPY_EXTERNAL_DLLS DebugDLLs ReleaseDLLs failOnError)
MESSAGE(STATUS "Copying external DLLs")
SET(debug_dir "${VRN_HOME}/bin/Debug")
SET(debug_dir "${TUMVIS_HOME}/bin/Debug")
IF(NOT EXISTS ${debug_dir})
FILE(MAKE_DIRECTORY ${debug_dir})
ENDIF()
......@@ -36,7 +36,7 @@ MACRO(COPY_EXTERNAL_DLLS DebugDLLs ReleaseDLLs failOnError)
ENDIF()
ENDFOREACH()
SET(release_dir "${VRN_HOME}/bin/Release")
SET(release_dir "${TUMVIS_HOME}/bin/Release")
IF(NOT EXISTS ${release_dir})
FILE(MAKE_DIRECTORY ${release_dir})
ENDIF()
......@@ -64,13 +64,13 @@ MACRO(ADD_COPY_DLL_COMMAND Target DebugDLLs ReleaseDLLs)
MESSAGE(${dll})
ADD_CUSTOM_COMMAND(
TARGET ${Target}
COMMAND ${CMAKE_COMMAND} -E copy ${dll} ${VRN_HOME}/bin/Debug
COMMAND ${CMAKE_COMMAND} -E copy ${dll} ${TUMVIS_HOME}/bin/Debug
)
ENDFOREACH()
FOREACH(dll ${${ReleaseDLLs}})
ADD_CUSTOM_COMMAND(
TARGET ${Target}
COMMAND ${CMAKE_COMMAND} -E copy ${dll} ${VRN_HOME}/bin/Release
COMMAND ${CMAKE_COMMAND} -E copy ${dll} ${TUMVIS_HOME}/bin/Release
)
ENDFOREACH()
ENDMACRO(ADD_COPY_DLL_COMMAND)
......
......@@ -39,7 +39,7 @@ namespace TUMVis {
// open file and prepare for read
std::ifstream file(_url.c_str(), std::ios::in | std::ios::binary | std::ios::ate);
if (file.is_open()) {
size_t fileSize = file.tellg();
size_t fileSize = static_cast<size_t>(file.tellg());
if (fileSize < numBytes) {
LERROR("File is smaller than expected.");
return WeaklyTypedPointer(_type, 0);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment