Attention une mise à jour du serveur va être effectuée le lundi 17 mai entre 13h et 13h30. Cette mise à jour va générer une interruption du service de quelques minutes.

Commit 23b4b3bd authored by NICLAUSSE Nicolas's avatar NICLAUSSE Nicolas

Merge branch 'release/1.4.0'

parents 5981dcee 3dd3801a
......@@ -8,6 +8,8 @@
src/dtk/dtkConfig.h
wrp/dtkCore
qml/*/qmldir
doc/html
......@@ -41,3 +43,11 @@ build-*
*.user
.cproject
.project
## ###################################################################
## TAGS
## ###################################################################
TAGS
GTAGS
cscope.out
# ChangeLog
## version 1.4.0 - 2018-03-08
- major update to python wrapping: enhance swig (now we can implement pure python plugins) + add sip wrapping for dtkWidgets. update to dtk_wrap macro API
- no longer use find_packages for Qt in dtkConfig
- add dtkObjectManager
- add dtkViewManager and associated classes
- add dtkCorePluginWidgetManager as a singleton that stores a map between concept objects encapsulated within a QVariant and widgets that have to be provided by the plugins. This enable plugins that have specific setters and getters to be handled in the composer through widget editors. This mechanism replace dtkWidgetFactory
- minor bugfixes
- **this will be the last version of DTK that will include the support layers **
......@@ -23,8 +23,8 @@ project(dtk)
## ###################################################################
set(dtk_VERSION_MAJOR 1)
set(dtk_VERSION_MINOR 3)
set(dtk_VERSION_PATCH 4)
set(dtk_VERSION_MINOR 4)
set(dtk_VERSION_PATCH 0)
set(dtk_VERSION
${dtk_VERSION_MAJOR}.${dtk_VERSION_MINOR}.${dtk_VERSION_PATCH})
......@@ -181,6 +181,12 @@ find_package(Qt5 REQUIRED COMPONENTS
Widgets
Xml)
## ###################################################################
##
## ###################################################################
include(${CMAKE_SOURCE_DIR}/cmake/dtkWrap.cmake)
## ###################################################################
## Doc setup
## ###################################################################
......@@ -192,104 +198,6 @@ get_target_property(QT5_QMAKE_EXECUTABLE Qt5::qmake LOCATION)
get_filename_component(QT5_BINARY_DIR ${QT5_QMAKE_EXECUTABLE} PATH)
## #################################################################
## Wrapping
## #################################################################
if(DTK_BUILD_WRAPPERS)
## #################################################################
## Swig
## #################################################################
mark_as_advanced(SWIG_DIR)
mark_as_advanced(SWIG_EXECUTABLE)
mark_as_advanced(SWIG_VERSION)
find_package(SWIG REQUIRED)
if(SWIG_FOUND)
include(${SWIG_USE_FILE})
set(CMAKE_SWIG_FLAGS "")
macro(dtk_wrap project target name language input deps)
set(wrap_output ${project}_wrap_${language}.cpp)
add_custom_command(
OUTPUT ${wrap_output}
COMMAND ${SWIG_EXECUTABLE}
ARGS
"-${language}"
"-c++"
"-module" ${name}
"-I${PROJECT_SOURCE_DIR}/.."
"-I${PROJECT_SOURCE_DIR}/"
"-I${dtk_SOURCE_DIR}/"
"-I${dtk_SOURCE_DIR}/src"
"-I${dtk_SOURCE_DIR}/src/dtkCoreSupport"
"-outdir" ${CMAKE_CURRENT_BINARY_DIR}
"-o" ${wrap_output}
${input}
MAIN_DEPENDENCY ${input}
COMMENT "Wrapping ${input} to ${language}")
set(${target} ${${target}} ${wrap_output})
endmacro(dtk_wrap)
else(SWIG_FOUND)
message("DTK_BUILD_WRAPPERS options requires SWIG.")
endif(SWIG_FOUND)
if(SWIG_FOUND)
add_definitions(-DHAVE_SWIG)
endif(SWIG_FOUND)
## #################################################################
## Tcl
## #################################################################
find_package(TCL QUIET)
if(TCL_FOUND)
include_directories(${TCL_INCLUDE_PATH})
endif(TCL_FOUND)
if(TCL_FOUND)
add_definitions(-DHAVE_TCL) # Towards deprecation
set(DTK_HAVE_TCL 1)
else(TCL_FOUND)
set(DTK_HAVE_TCL 0)
endif(TCL_FOUND)
## #################################################################
## Python
## #################################################################
set(DTK_PYTHON_VERSION 2 CACHE STRING "Python version to use: 2, 2.x, 3, 3.x, or empty")
find_package(PythonInterp ${DTK_PYTHON_VERSION})
find_package(PythonLibs QUIET)
if(PYTHONLIBS_FOUND)
include_directories(${PYTHON_INCLUDE_DIRS})
get_filename_component(PYTHON_PATH ${PYTHON_LIBRARIES} PATH)
link_directories(${PYTHON_PATH})
add_definitions(-DHAVE_PYTHON) # Towards deprecation
set(DTK_HAVE_PYTHON 1)
else(PYTHONLIBS_FOUND)
set(DTK_HAVE_PYTHON 0)
endif(PYTHONLIBS_FOUND)
## #################################################################
## Build wrappers (end)
## #################################################################
endif(DTK_BUILD_WRAPPERS)
## #################################################################
## Dependencies - Optional [TO BE REMOVED]
## #################################################################
......@@ -397,6 +305,38 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/dtkScript)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/dtkTest)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/dtkWidgets)
if(DTK_BUILD_SUPPORT_CORE)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/dtkCoreSupport)
endif()
if(DTK_BUILD_SUPPORT_CONTAINER)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/dtkContainerSupport)
endif()
if(DTK_BUILD_SUPPORT_COMPOSER)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/dtkComposerSupport)
endif()
if(DTK_BUILD_SUPPORT_DISTRIBUTED)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/dtkDistributedSupport)
endif()
if(DTK_BUILD_SUPPORT_GUI)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/dtkGuiSupport)
endif()
if(DTK_BUILD_SUPPORT_MATH)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/dtkMathSupport)
endif()
if(DTK_BUILD_SUPPORT_PLOT)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/dtkPlotSupport)
endif()
if(DTK_BUILD_SUPPORT_VR)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/dtkVrSupport)
endif()
## ###################################################################
## Input
## ###################################################################
......@@ -405,6 +345,7 @@ add_subdirectory(src)
add_subdirectory(tst)
add_subdirectory(app)
add_subdirectory(doc)
add_subdirectory(wrp)
## ###################################################################
## Exporting
......@@ -422,21 +363,21 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/dtkConfigVersion.cmake.in
"${CMAKE_CURRENT_BINARY_DIR}/dtkConfigVersion.cmake" @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/dtkSetTestEnvironment.cmake.in
"${CMAKE_CURRENT_BINARY_DIR}/dtkSetTestEnvironment.cmake" @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/dtkCodeCoverage.cmake
"${CMAKE_CURRENT_BINARY_DIR}/dtkCodeCoverage.cmake" @ONLY)
"${CMAKE_CURRENT_BINARY_DIR}/dtkSetTestEnvironment.cmake" @ONLY)
set_directory_properties(PROPERTIES TEST_INCLUDE_FILE "${CMAKE_CURRENT_BINARY_DIR}/dtkSetTestEnvironment.cmake")
install(FILES
"${CMAKE_CURRENT_BINARY_DIR}/install/dtkConfig.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/dtkConfigVersion.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/dtkCodeCoverage.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/dtkSetTestEnvironment.cmake"
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/dtk)
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/dtkCodeCoverage.cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/dtkWrap.cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindSIP.cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindSIP.py"
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/dtk)
install(EXPORT dtkDepends DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/dtk)
install(EXPORT dtkDepends DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/dtk)
## ###################################################################
## Beautifying
......@@ -446,6 +387,7 @@ mark_as_advanced(dtk_VERSION_MAJOR)
mark_as_advanced(dtk_VERSION_MINOR)
mark_as_advanced(dtk_VERSION_BUILD)
mark_as_advanced(Qt5_DIR)
mark_as_advanced(Qt5Concurrent_DIR)
mark_as_advanced(Qt5Core_DIR)
mark_as_advanced(Qt5Gui_DIR)
......@@ -472,17 +414,7 @@ mark_as_advanced(DTK_ENABLE_MEMCHECK)
mark_as_advanced(DTK_COVERAGE_USE_COBERTURA)
mark_as_advanced(DTK_PYTHON_VERSION)
## ###################################################################
## Packaging
## ###################################################################
include(InstallRequiredSystemLibraries)
set(CPACK_PACKAGE_VERSION_MAJOR "${dtk_VERSION_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${dtk_VERSION_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${dtk_VERSION_PATCH}")
include(CPack)
mark_as_advanced(CCACHE_FOUND)
######################################################################
### CMakeLists.txt ends here
......@@ -28,7 +28,7 @@ int main(int argc, char **argv)
dtkDistributedGuiApplication *application = dtkDistributedGuiApplication::create(argc, argv);
application->setApplicationName("dtkComposerEvaluator");
application->setApplicationVersion("1.0.0");
application->setApplicationVersion("1.4.0");
application->setOrganizationName("inria");
application->setOrganizationDomain("fr");
bool no_gui = application->noGui();
......@@ -116,4 +116,3 @@ int main(int argc, char **argv)
}
}
}
......@@ -21,31 +21,38 @@ project(dtkConceptGenerator)
set(CMAKE_AUTOMOC ON)
set(${PROJECT_NAME}_HEADERS
dtkPluginGeneratorPage.h
dtkConceptDefinitionPage.h
dtkConceptGenerator.h
dtkNewConceptPage.h
dtkIntroPage.h
generator.h)
dtkPluginGeneratorPage.h
dtkConceptDefinitionPage.h
dtkConceptGenerator.h
dtkNewConceptPage.h
dtkIntroPage.h
generator.h)
set(${PROJECT_NAME}_SOURCES
dtkPluginGeneratorPage.cpp
dtkConceptDefinitionPage.cpp
dtkConceptGenerator.cpp
dtkNewConceptPage.cpp
dtkIntroPage.cpp
generator.cpp
main.cpp)
dtkPluginGeneratorPage.cpp
dtkConceptDefinitionPage.cpp
dtkConceptGenerator.cpp
dtkNewConceptPage.cpp
dtkIntroPage.cpp
generator.cpp
main.cpp)
set(${PROJECT_NAME}_UI
dtkPluginGeneratorPage.ui
dtkConceptDefinitionPage.ui
dtkNewConceptPage.ui
dtkIntroPage.ui)
dtkPluginGeneratorPage.ui
dtkConceptDefinitionPage.ui
dtkNewConceptPage.ui
dtkIntroPage.ui)
set(${PROJECT_NAME}_RESOURCES
templates.qrc)
set_property(SOURCE ui_dtkPluginGeneratorPage.h PROPERTY SKIP_AUTOMOC ON)
set_property(SOURCE ui_dtkConceptDefinitionPage.h PROPERTY SKIP_AUTOMOC ON)
set_property(SOURCE ui_dtkNewConceptPage.h PROPERTY SKIP_AUTOMOC ON)
set_property(SOURCE ui_dtkIntroPage.h PROPERTY SKIP_AUTOMOC ON)
set_property(SOURCE qrc_templates.cpp PROPERTY SKIP_AUTOMOC ON)
## #################################################################
## Build rules
## #################################################################
......
......@@ -10,11 +10,10 @@ project(dtkDistributedDashboard)
## Sources
## #################################################################
set(${PROJECT_NAME}_SOURCES
main.cpp)
set(${PROJECT_NAME}_SOURCES main.cpp)
set(${PROJECT_NAME}_RESOURCES dtkDashboard.qrc)
set(${PROJECT_NAME}_RESOURCES
dtkDashboard.qrc)
set_property(SOURCE qrc_dtkDashboard.cpp PROPERTY SKIP_AUTOMOC ON)
## #################################################################
## Build rules
......@@ -29,8 +28,7 @@ add_executable(${PROJECT_NAME}
target_link_libraries(${PROJECT_NAME}
dtkDistributed
dtkLog
dtkWidgets
)
dtkWidgets)
target_link_libraries(${PROJECT_NAME} Qt5::Core)
target_link_libraries(${PROJECT_NAME} Qt5::Network)
......
......@@ -23,7 +23,7 @@ int main(int argc, char **argv)
{
dtkCoreApplication *application = dtkCoreApplication::create(argc, argv);
application->setApplicationName("dtkDistributedServer");
application->setApplicationVersion("1.0.0");
application->setApplicationVersion("1.4.0");
application->setOrganizationName("inria");
application->setOrganizationDomain("fr");
......
......@@ -61,7 +61,7 @@ int main(int argc, char **argv)
{
dtkDistributedGuiApplication *app = dtkDistributedGuiApplication::create(argc, argv);
app->setApplicationName("dtkDistributedSlave");
app->setApplicationVersion("1.0.0");
app->setApplicationVersion("1.4.0");
app->setOrganizationName("inria");
QCommandLineParser *parser = app->parser();
......
# Find SIP
# ~~~~~~~~
#
# SIP website: http://www.riverbankcomputing.co.uk/sip/index.php
#
# Find the installed version of SIP. FindSIP should be called after Python
# has been found.
#
# This file defines the following variables:
#
# SIP_VERSION - The version of SIP found expressed as a 6 digit hex number
# suitable for comparison as a string.
#
# SIP_VERSION_STR - The version of SIP found as a human readable string.
#
# SIP_EXECUTABLE - Path and filename of the SIP command line executable.
#
# SIP_INCLUDE_DIR - Directory holding the SIP C++ header file.
#
# SIP_DEFAULT_SIP_DIR - Default directory where .sip files should be installed
# into.
# Copyright (c) 2007, Simon Edwards <simon@simonzone.com>
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
# IF(SIP_VERSION)
# # Already in cache, be silent
# message("SIP already found")
# SET(SIP_FOUND TRUE)
# ELSE(SIP_VERSION)
FIND_FILE(_find_sip_py FindSIP.py PATHS ${CMAKE_MODULE_PATH})
EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_sip_py} OUTPUT_VARIABLE sip_config)
IF(sip_config)
STRING(REGEX REPLACE "^sip_version:([^\n]+).*$" "\\1" SIP_VERSION_output ${sip_config})
set(SIP_VERSION ${SIP_VERSION_output} CACHE STRING "Sip version" FORCE)
STRING(REGEX REPLACE ".*\nsip_version_str:([^\n]+).*$" "\\1" SIP_VERSION_STR ${sip_config})
STRING(REGEX REPLACE ".*\nsip_bin:([^\n]+).*$" "\\1" SIP_EXECUTABLE_output ${sip_config})
set(SIP_EXECUTABLE ${SIP_EXECUTABLE_output} CACHE STRING "Sip executable" FORCE)
IF(NOT SIP_DEFAULT_SIP_DIR)
STRING(REGEX REPLACE ".*\ndefault_sip_dir:([^\n]+).*$" "\\1" SIP_DEFAULT_SIP_DIR ${sip_config})
set(SIP_MODULE_DIR ${SIP_DEFAULT_SIP_DIR} CACHE STRING "Sip default dir" FORCE)
set(PYQT5_MODULE_DIR "${SIP_DEFAULT_SIP_DIR}/PyQt5" CACHE STRING "PyQt5 module dir" FORCE)
ENDIF(NOT SIP_DEFAULT_SIP_DIR)
STRING(REGEX REPLACE ".*\nsip_inc_dir:([^\n]+).*$" "\\1" SIP_INCLUDE_DIR ${sip_config})
FILE(TO_CMAKE_PATH ${SIP_DEFAULT_SIP_DIR} SIP_DEFAULT_SIP_DIR)
FILE(TO_CMAKE_PATH ${SIP_INCLUDE_DIR} SIP_INCLUDE_DIR)
IF(EXISTS ${SIP_EXECUTABLE})
SET(SIP_FOUND TRUE)
SET(SIP_VERSION)
ELSE()
MESSAGE(STATUS "Found SIP configuration but the sip executable could not be found.")
ENDIF()
ELSE(sip_config)
MESSAGE(STATUS "Found SIP configuration but the sip executable did not output anything.")
ENDIF(sip_config)
IF(SIP_FOUND)
IF(NOT SIP_FIND_QUIETLY)
MESSAGE(STATUS "Found SIP version: ${SIP_VERSION_STR}")
ENDIF(NOT SIP_FIND_QUIETLY)
ELSE(SIP_FOUND)
IF(SIP_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find SIP")
ENDIF(SIP_FIND_REQUIRED)
ENDIF(SIP_FOUND)
# ENDIF(SIP_VERSION)
# FindSIP.py
#
# Copyright (c) 2007, Simon Edwards <simon@simonzone.com>
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
import sys
import sipconfig
sipcfg = sipconfig.Configuration()
print("sip_version:%06.0x" % sipcfg.sip_version)
print("sip_version_str:%s" % sipcfg.sip_version_str)
print("sip_bin:%s" % sipcfg.sip_bin)
print("default_sip_dir:%s" % sipcfg.default_sip_dir)
print("sip_inc_dir:%s" % sipcfg.sip_inc_dir)
......@@ -20,6 +20,8 @@ set(DTK_BUILD_64 @DTK_BUILD_64@)
## - dtk_INCLUDE_DIRS
## ###################################################################
set(dtk_INCLUDE_DIR "@CMAKE_CURRENT_SOURCE_DIR@")
set(dtk_INCLUDE_DIRS
"@CMAKE_CURRENT_SOURCE_DIR@"
"@CMAKE_CURRENT_SOURCE_DIR@/include"
......@@ -33,20 +35,18 @@ set(dtk_INCLUDE_DIRS
"@CMAKE_CURRENT_BINARY_DIR@")
include("@CMAKE_BINARY_DIR@/dtkDepends.cmake")
include("@CMAKE_SOURCE_DIR@/cmake/dtkWrap.cmake")
set(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH} "@CMAKE_SOURCE_DIR@/cmake/")
set_directory_properties(PROPERTIES TEST_INCLUDE_FILE "@CMAKE_BINARY_DIR@/dtkSetTestEnvironment.cmake")
find_package(Qt5 REQUIRED COMPONENTS
Core
Concurrent
Network
Quick
Svg
Test
Widgets
Xml)
set(dtk_MODULE_PATH "@CMAKE_BINARY_DIR@")
set(dtk_INSTALL_DOCS "@dtk_INSTALL_DOCS@")
set(dtk_CONFIG_DOCS "@dtk_CONFIG_DOCS@")
set(dtk_INSTALL_DOCS @dtk_INSTALL_DOCS@)
set(dtk_CONFIG_DOCS @dtk_CONFIG_DOCS@)
set(dtk_WRAP_PREFIX "@CMAKE_SOURCE_DIR@/wrp")
## ###################################################################
## Options
......@@ -87,6 +87,15 @@ if(DTK_BUILD_SCRIPT)
set(dtk_INCLUDE_DIRS ${dtk_INCLUDE_DIRS} "@CMAKE_CURRENT_SOURCE_DIR@/src/dtkScript")
endif(DTK_BUILD_SCRIPT)
if(DTK_BUILD_WRAPPERS)
set(SIP_FOUND @SIP_FOUND@)
set(SWIG_FOUND @SWIG_FOUND@)
set(DTK_PYTHON_WRAPPER @DTK_PYTHON_WRAPPER@)
set(DTK_WRAPPING_PYTHON @DTK_WRAPPING_PYTHON@)
set(DTK_WRAPPING_CSHARP @DTK_WRAPPING_CSHARP@)
set(DTK_WRAPPING_TCL @DTK_WRAPPING_TCL@)
endif(DTK_BUILD_WRAPPERS)
if(DTK_BUILD_WIDGETS)
set(dtk_INCLUDE_DIRS ${dtk_INCLUDE_DIRS} "@CMAKE_CURRENT_SOURCE_DIR@/src/dtkWidgets")
endif(DTK_BUILD_WIDGETS)
......@@ -103,6 +112,10 @@ if(DTK_BUILD_SUPPORT_MATH)
set(dtk_INCLUDE_DIRS ${dtk_INCLUDE_DIRS} "@CMAKE_CURRENT_SOURCE_DIR@/include/dtkMathSupport")
endif(DTK_BUILD_SUPPORT_MATH)
if(DTK_BUILD_SUPPORT_GUI)
set(dtk_INCLUDE_DIRS ${dtk_INCLUDE_DIRS} "@CMAKE_CURRENT_SOURCE_DIR@/include/dtkGuiSupport")
endif(DTK_BUILD_SUPPORT_GUI)
## ###################################################################
## Helper function
## ###################################################################
......
......@@ -18,6 +18,7 @@ set(DTK_BUILD_64 @DTK_BUILD_64@)
## ###################################################################
##
## ###################################################################
set(dtk_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/")
set(dtk_INCLUDE_DIRS
"@CMAKE_INSTALL_PREFIX@/include"
......@@ -35,19 +36,12 @@ set(DTK_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@")
set(dtk_INSTALL_DOCS "@CMAKE_INSTALL_PREFIX@/doc")
set(dtk_WRAP_PREFIX "@CMAKE_INSTALL_PREFIX@/wrp")
include("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/cmake/dtk/dtkDepends.cmake")
include("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/cmake/dtk/dtkWrap.cmake")
set_directory_properties(PROPERTIES TEST_INCLUDE_FILE "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/cmake/dtk/dtkSetTestEnvironment.cmake")
find_package(Qt5 REQUIRED COMPONENTS
Core
Concurrent
Network
Quick
Svg
Test
Widgets
Xml)
## ###################################################################
## Options
## ###################################################################
......@@ -87,6 +81,12 @@ if(DTK_BUILD_SCRIPT)
set(dtk_INCLUDE_DIRS ${dtk_INCLUDE_DIRS} "@CMAKE_INSTALL_PREFIX@/include/dtkScript")
endif(DTK_BUILD_SCRIPT)
if(DTK_BUILD_WRAPPERS)
set(DTK_WRAPPING_PYTHON @DTK_WRAPPING_PYTHON@)
set(DTK_WRAPPING_CSHARP @DTK_WRAPPING_CSHARP@)
set(DTK_WRAPPING_TCL @DTK_WRAPPING_TCL@)
endif(DTK_BUILD_WRAPPERS)
if(DTK_BUILD_WIDGETS)
set(dtk_INCLUDE_DIRS ${dtk_INCLUDE_DIRS} "@CMAKE_INSTALL_PREFIX@/include/dtkWidgets")
endif(DTK_BUILD_WIDGETS)
......
......@@ -11,13 +11,10 @@
# Choose a configuration with which to drive CTest tests.
set(PATHS_FOR_TESTS "$ENV{PATH}")
if(@CMAKE_SYSTEM_NAME@ STREQUAL Windows)
set(PATHS_FOR_TESTS)
list(APPEND PATHS_FOR_TESTS "@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/@CMAKE_BUILD_TYPE@")
list(APPEND PATHS_FOR_TESTS "@QT5_BINARY_DIR@")
else()
#Make string list from paths.
set(PATHS_FOR_TESTS "$ENV{PATH}")
endif()
set(ENV{PATH} "${PATHS_FOR_TESTS}")
## Version: $Id$
##
######################################################################
##
### Commentary:
##
######################################################################
##
### Change Log:
##
######################################################################
##
### Code:
if(DTK_BUILD_WRAPPERS)
## #################################################################
## Python
## #################################################################
if(DTK_WRAPPING_PYTHON)
set(DTK_PYTHON_VERSION 2 CACHE STRING "Python version to use: 2, 2.x, 3, 3.x, or empty")