X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=c74a28ef0544b1e9dc7bf092951bee5fba59e96b;hb=d79fc05657cfa43ed1cd6937a5acaeaf70e09b45;hp=93b210c9fda32bc7d0325c8bf53392dec7d672e0;hpb=c1b52c90d747fd4fd13a6ec2c50a4d76d88a51a5;p=creaMaracasVisu.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 93b210c..c74a28e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,9 +38,22 @@ ENDIF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_ PROJECT(creaMaracasVisu) +#----------------------------------------------------------------------------- +# Configure Dart testing support. This should be done before any +# MESSAGE(FATAL_ERROR ...) commands are invoked. +IF(INCLUDE_CTEST) + INCLUDE(CTest) + ENABLE_TESTING() +ENDIF(INCLUDE_CTEST) +IF(BUILD_TESTING) + SET(BUILDNAME "${BUILDNAME}" CACHE STRING "Name of build on the dashboard") + MARK_AS_ADVANCED(BUILDNAME) +ENDIF(BUILD_TESTING) +#----------------------------------------------------------------------------- + SET(PROJECT_MAJOR_VERSION 1) -SET(PROJECT_MINOR_VERSION 1) -SET(PROJECT_BUILD_VERSION 1) +SET(PROJECT_MINOR_VERSION 2) +SET(PROJECT_BUILD_VERSION 0) #================================== @@ -131,6 +144,8 @@ INCLUDE_DIRECTORIES(/usr/lib/x86_64-linux-gnu/gtk-2.0/include/) LINK_DIRECTORIES(/usr/lib/x86_64-linux-gnu/) #JCP Ubuntu this file not found glibconfig.h, config of wxgtk goes wrong somewhere + + ADD_SUBDIRECTORY(install) ADD_SUBDIRECTORY(lib) ADD_SUBDIRECTORY(bbtk)