Commit 8efd27e4 authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

Improved various cmake files:

* Disabled MSVC warnings when building freetype
* Added support to copy ITK libraries
parent 5b5f3afd
......@@ -104,6 +104,8 @@ set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
# Compiler definitions for building the library
add_definitions(-DFT2_BUILD_LIBRARY)
# Compiler definitions to disable warnings in MSVC
add_definitions("-D_CRT_SECURE_NO_WARNINGS")
# Specify library include directories
include_directories("${PROJECT_SOURCE_DIR}/include")
......
......@@ -10,6 +10,12 @@ IF(${ModuleEnabled})
LIST(APPEND CampvisGlobalIncludeDirs ${ITK_INCLUDE_DIRS})
LIST(APPEND CampvisGlobalExternalLibs ${ITK_LIBRARIES})
IF(${BUILD_SHARED_LIBS} AND WIN32)
LIST(APPEND CampvisExternalDllsDebug "${ITK_DIR}/bin/Debug/ITKCommon-${ITK_VERSION_MAJOR}.${ITK_VERSION_MINOR}.dll")
LIST(APPEND CampvisExternalDllsRelease "${ITK_DIR}/bin/Release/ITKCommon-${ITK_VERSION_MAJOR}.${ITK_VERSION_MINOR}.dll")
ENDIF(${BUILD_SHARED_LIBS} AND WIN32)
IF("${ITK_VERSION_MAJOR}" LESS 4)
MESSAGE(FATAL_ERROR "Found ITK Version ${ITK_VERSION_MAJOR} < 4. CAMPVis needs ITK version >= 4.")
ELSE()
......
......@@ -57,8 +57,7 @@ LIST(APPEND AlglibSources
# Defines the alglib librarie.
ADD_LIBRARY(alglib STATIC
${AlglibSources} ${AlglibHeaders} )
ADD_LIBRARY(alglib ${AlglibSources} ${AlglibHeaders})
#cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc)
#$target_link_libraries(gtest_main alglib)
......
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