2.12.2021, 9:00 - 11:00: Due to updates GitLab may be unavailable for some minutes between 09:00 and 11:00.

Commit 52f8a62b authored by schultezub's avatar schultezub
Browse files

fixed CMake files

git-svn-id: https://camplinux.in.tum.de/svn/campvis/trunk@345 bb408c1c-ae56-11e1-83d9-df6b3e0c105e
parent ff29ff68
......@@ -6,7 +6,7 @@
# win32: GLEW_LIBRARY_DEBUG, GLEW_LIBRARY_RELEASE, GLEW_DLL_DEBUG, GLEW_DLL_RELEASE, GLEW_LICENSE_FILE
IF (WIN32)
SET(GLEW_DIR "${CAMPVIS_HOME}/ext/glew" CACHE PATH "If glew is not found, set this path")
SET(GLEW_DIR "${CampvisHome}/ext/glew" CACHE PATH "If glew is not found, set this path")
# SET(GLEW_DEFINITIONS "-DGLEW_STATIC")
......
......@@ -6,7 +6,7 @@
# win32: GLUT_DEBUG_LIBRARY, GLUT_RELEASE_LIBRARY, GLUT_DEBUG_DLLS, GLUT_RELEASE_DLLS
IF(WIN32)
SET(GLUT_DIR "${CAMPVIS_HOME}/ext/glut" CACHE PATH "If glut is not found, set this path")
SET(GLUT_DIR "${CampvisHome}/ext/glut" CACHE PATH "If glut is not found, set this path")
SET(GLUT_DEFINITIONS "-DGLUT_NO_LIB_PRAGMA")
......
......@@ -6,33 +6,33 @@
# TBB_LICENSE_FILE
IF (WIN32)
SET(TBB_DIR "${CAMPVIS_HOME}/ext/tbb" CACHE PATH "If TBB is not found, set this path")
SET(TbbDirectory "${CampvisHome}/ext/tbb" CACHE PATH "If TBB is not found, set this path")
SET(TBB_INCLUDE_DIR "${TBB_DIR}/include")
SET(TBB_INCLUDE_DIR "${TbbDirectory}/include")
IF(CAMPVIS_MSVC2008)
SET(TBB_CDIR "vc9")
SET(TbbCompilerDirectory "vc9")
ELSEIF(CAMPVIS_MSVC2010)
SET(TBB_CDIR "vc10")
SET(TbbCompilerDirectory "vc10")
ELSE()
MESSAGE(WARNING "Compiler not supported by makefile, you might be able to fix that...")
ENDIF(CAMPVIS_MSVC2008)
# set debug and release library
IF(CAMPVIS_WIN32)
SET(TBB_LIBRARY_DEBUG "${TBB_DIR}/lib/ia32/${TBB_CDIR}/tbb_debug.lib")
SET(TBB_DLL_DEBUG "${TBB_DIR}/bin/ia32/${TBB_CDIR}/tbb_debug.dll")
SET(TBB_PDB_DEBUG "${TBB_DIR}/bin/ia32/${TBB_CDIR}/tbb_debug.pdb")
SET(TBB_LIBRARY_RELEASE "${TBB_DIR}/lib/ia32/${TBB_CDIR}/tbb.lib")
SET(TBB_DLL_RELEASE "${TBB_DIR}/bin/ia32/${TBB_CDIR}/tbb.dll")
SET(TBB_PDB_RELEASE "${TBB_DIR}/bin/ia32/${TBB_CDIR}/tbb.pdb")
SET(TBB_LIBRARY_DEBUG "${TbbDirectory}/lib/ia32/${TbbCompilerDirectory}/tbb_debug.lib")
SET(TBB_DLL_DEBUG "${TbbDirectory}/bin/ia32/${TbbCompilerDirectory}/tbb_debug.dll")
SET(TBB_PDB_DEBUG "${TbbDirectory}/bin/ia32/${TbbCompilerDirectory}/tbb_debug.pdb")
SET(TBB_LIBRARY_RELEASE "${TbbDirectory}/lib/ia32/${TbbCompilerDirectory}/tbb.lib")
SET(TBB_DLL_RELEASE "${TbbDirectory}/bin/ia32/${TbbCompilerDirectory}/tbb.dll")
SET(TBB_PDB_RELEASE "${TbbDirectory}/bin/ia32/${TbbCompilerDirectory}/tbb.pdb")
ELSEIF(CAMPVIS_WIN64)
SET(TBB_LIBRARY_DEBUG "${TBB_DIR}/lib/intel64/${TBB_CDIR}/tbb_debug.lib")
SET(TBB_DLL_DEBUG "${TBB_DIR}/bin/intel64/${TBB_CDIR}/tbb_debug.dll")
SET(TBB_PDB_DEBUG "${TBB_DIR}/bin/intel64/${TBB_CDIR}/tbb_debug.pdb")
SET(TBB_LIBRARY_RELEASE "${TBB_DIR}/lib/intel64/${TBB_CDIR}/tbb.lib")
SET(TBB_DLL_RELEASE "${TBB_DIR}/bin/intel64/${TBB_CDIR}/tbb.dll")
SET(TBB_PDB_RELEASE "${TBB_DIR}/bin/intel64/${TBB_CDIR}/tbb.pdb")
SET(TBB_LIBRARY_DEBUG "${TbbDirectory}/lib/intel64/${TbbCompilerDirectory}/tbb_debug.lib")
SET(TBB_DLL_DEBUG "${TbbDirectory}/bin/intel64/${TbbCompilerDirectory}/tbb_debug.dll")
SET(TBB_PDB_DEBUG "${TbbDirectory}/bin/intel64/${TbbCompilerDirectory}/tbb_debug.pdb")
SET(TBB_LIBRARY_RELEASE "${TbbDirectory}/lib/intel64/${TbbCompilerDirectory}/tbb.lib")
SET(TBB_DLL_RELEASE "${TbbDirectory}/bin/intel64/${TbbCompilerDirectory}/tbb.dll")
SET(TBB_PDB_RELEASE "${TbbDirectory}/bin/intel64/${TbbCompilerDirectory}/tbb.pdb")
ELSE()
MESSAGE(FATAL_ERROR "Neither CAMPVIS_WIN32 nor CAMPVIS_WIN64 defined!")
ENDIF(CAMPVIS_WIN32)
......@@ -41,19 +41,19 @@ IF (WIN32)
SET(TBB_LIBRARY debug ${TBB_LIBRARY_DEBUG} optimized ${TBB_LIBRARY_RELEASE})
ENDIF(TBB_LIBRARY_DEBUG AND TBB_LIBRARY_RELEASE)
SET(TBB_LICENSE_FILE "${TBB_DIR}/COPYING")
SET(TBB_LICENSE_FILE "${TbbDirectory}/COPYING")
ELSE (WIN32)
FIND_PATH(
TBB_INCLUDE_DIR
NAMES tbb/mutex.h
PATHS ${TBB_DIR}/include /usr/include /usr/local/include /sw/include /opt/local/include
PATHS ${TbbDirectory}/include /usr/include /usr/local/include /sw/include /opt/local/include
DOC "The directory where tbb/*.h resides"
)
FIND_LIBRARY(
TBB_LIBRARY
NAMES TBB libtbb
PATHS ${TBB_DIR}/lib /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib /sw/lib /opt/local/lib
PATHS ${TbbDirectory}/lib /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib /sw/lib /opt/local/lib
DOC "The TBB library"
)
ENDIF (WIN32)
......@@ -64,5 +64,5 @@ ELSE(TBB_INCLUDE_DIR AND TBB_LIBRARY)
SET(TBB_FOUND FALSE)
ENDIF(TBB_INCLUDE_DIR AND TBB_LIBRARY)
UNSET(TBB_DIR)
MARK_AS_ADVANCED(TBB_DIR TBB_DIR TBB_INCLUDE_DIR TBB_LIBRARY TBB_LIBRARY_DEBUG TBB_LIBRARY_RELEASE TBB_DLL_DEBUG TBB_DLL_RELEASE)
UNSET(TbbDirectory)
MARK_AS_ADVANCED(TbbDirectory TbbDirectory TBB_INCLUDE_DIR TBB_LIBRARY TBB_LIBRARY_DEBUG TBB_LIBRARY_RELEASE TBB_DLL_DEBUG TBB_DLL_RELEASE)
......@@ -18,7 +18,7 @@ ENDMACRO(LIST_SUBDIRECTORIES)
MACRO(COPY_EXTERNAL_DLLS DebugDLLs ReleaseDLLs failOnError)
MESSAGE(STATUS "Copying external DLLs")
SET(debug_dir "${CAMPVIS_HOME}/bin/Debug")
SET(debug_dir "${CampvisHome}/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 "${CAMPVIS_HOME}/bin/Release")
SET(release_dir "${CampvisHome}/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} ${CAMPVIS_HOME}/bin/Debug
COMMAND ${CMAKE_COMMAND} -E copy ${dll} ${CampvisHome}/bin/Debug
)
ENDFOREACH()
FOREACH(dll ${${ReleaseDLLs}})
ADD_CUSTOM_COMMAND(
TARGET ${Target}
COMMAND ${CMAKE_COMMAND} -E copy ${dll} ${CAMPVIS_HOME}/bin/Release
COMMAND ${CMAKE_COMMAND} -E copy ${dll} ${CampvisHome}/bin/Release
)
ENDFOREACH()
ENDMACRO(ADD_COPY_DLL_COMMAND)
......
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