Commit 3eb8f51d authored by NICLAUSSE Nicolas's avatar NICLAUSSE Nicolas

Merge branch 'hotfix/1.3.4' into develop

parents 89dbf12e eeeb0bc5
......@@ -24,7 +24,7 @@ project(dtk)
set(dtk_VERSION_MAJOR 1)
set(dtk_VERSION_MINOR 3)
set(dtk_VERSION_PATCH 3)
set(dtk_VERSION_PATCH 4)
set(dtk_VERSION
${dtk_VERSION_MAJOR}.${dtk_VERSION_MINOR}.${dtk_VERSION_PATCH})
......
......@@ -77,7 +77,7 @@ if(DTK_BUILD_COMPOSER)
endif(DTK_BUILD_COMPOSER)
if(DTK_BUILD_SCRIPT)
set(dtk_INCLUDE_DIRS ${dtk_INCLUDE_DIRS} "@CMAKE_INSTALL_PREFIX/include/dtkScript")
set(dtk_INCLUDE_DIRS ${dtk_INCLUDE_DIRS} "@CMAKE_INSTALL_PREFIX@/include/dtkScript")
endif(DTK_BUILD_SCRIPT)
if(DTK_BUILD_WRAPPERS)
......@@ -99,7 +99,9 @@ if(DTK_BUILD_SUPPORT_CONTAINER)
endif(DTK_BUILD_SUPPORT_CONTAINER)
if(DTK_BUILD_SUPPORT_MATH)
set(dtk_INCLUDE_DIRS ${dtk_INCLUDE_DIRS} "@CMAKE_INSTALL_PREFIX@/include/dtkMathSupport")
# dtkMathSuppor has conflicts with dtkMath and dtkLinearAlgebraSparse. (<dtkMath> and <dtkVector> includes),
# don't add include/dtkMathSupport in the dtk_INCLUDE_DIRS
# set(dtk_INCLUDE_DIRS ${dtk_INCLUDE_DIRS} "@CMAKE_INSTALL_PREFIX@/include/dtkMathSupport")
endif(DTK_BUILD_SUPPORT_MATH)
## ###################################################################
......
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