Force to rerun cmake before building from the custom build target.

CMakeLists.txt

@@ -134,10 +134,9 @@ endif()
 option(USE_GITHUB_SSH 
   "Use by default Git SSH addresses, requires public key set on github" OFF
   )
-mark_as_advanced(USE_GITHUB_SSH)
 
 set(PRIVATE_PLUGINS_DIRS "" CACHE PATH "Folders containing private plugins, separated by ';'")
-mark_as_advanced(PRIVATE_PLUGINS_DIRS)
+
 
 ## #############################################################################
 ## Add Targets

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013, Inria
+Copyright (c) 2013 - 2014, Inria
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

README.md

@@ -36,5 +36,5 @@ on the medInria web page :
 
 ####License
 
-Copyright (c) INRIA 2013. All rights reserved.
+Copyright (c) INRIA 2013 - 2014. All rights reserved.
 See LICENSE.txt for details.

cmake/externals/configuration_steps/EP_AddCustomTargets.cmake

@@ -45,9 +45,9 @@ foreach (dependency ${${ep}_dependencies})
 endforeach()
 
 add_custom_target(build-${ep} 
-  COMMAND cmake --build . --config ${CMAKE_BUILD_TYPE}
+  COMMAND cmake ${source_dir} && cmake --build . --config ${CMAKE_BUILD_TYPE}
   WORKING_DIRECTORY ${binary_dir}
-  COMMENT "build '${ep}' with 'cmake --build . --config ${CMAKE_BUILD_TYPE}'"
+  COMMENT "reconfigure and build '${ep}' with 'cmake --build . --config ${CMAKE_BUILD_TYPE}'"
   DEPENDS ${build-${ep}_dependences}
   )
 set(build-${ep} ON PARENT_SCOPE)

cmake/externals/projects_modules/DCMTK.cmake

@@ -111,8 +111,8 @@ ExternalProject_Add(${ep}
 ## Set variable to provide infos about the project
 ## #############################################################################
 
-ExternalProject_Get_Property(${ep} install_dir)
-set(${ep}_DIR ${install_dir} PARENT_SCOPE)
+ExternalProject_Get_Property(${ep} binary_dir)
+set(${ep}_DIR ${binary_dir} PARENT_SCOPE)
 
 
 ## #############################################################################

cmake/externals/projects_modules/medInria.cmake

@@ -33,8 +33,15 @@ list(APPEND ${ep}_dependencies
 set(MEDINRIA_TEST_DATA_ROOT 
   ${CMAKE_SOURCE_DIR}/medInria-testdata CACHE PATH
   "Root directory of the data used for the test of medInria")
-mark_as_advanced(MEDINRIA_TEST_DATA_ROOT)  
-
+mark_as_advanced(MEDINRIA_TEST_DATA_ROOT)
+
+if (APPLE OR WIN32) # REQUIRED for medVtkInria.
+  find_package(Boost REQUIRED)
+  set(cmake_args
+    -DBOOST_ROOT:PATH=${BOOST_ROOT}
+    -DBoost_INCLUDE_DIR:PATH=${Boost_INCLUDE_DIR}
+    )
+endif()  
 
 ## #############################################################################
 ## Prepare the project
@@ -92,12 +99,12 @@ set(cmake_args
   -DRPI_DIR:FILEPATH=${RPI_DIR}
   -DTTK_DIR:FILEPATH=${TTK_DIR}
   -DVTK_DIR:FILEPATH=${VTK_DIR}
-  -DBOOST_ROOT:PATH=${BOOST_ROOT}
   -DMEDINRIA-PLUGINS_BUILD_TOOLS:BOOL=ON
   -DMEDINRIA_VERSION_MAJOR:STRING=${${PROJECT_NAME}_VERSION_MAJOR}
   -DMEDINRIA_VERSION_MINOR:STRING=${${PROJECT_NAME}_VERSION_MINOR}
   -DMEDINRIA_VERSION_PATCH:STRING=${${PROJECT_NAME}_VERSION_PATCH}
   -DMEDINRIA_VERSION_TWEAK:STRING=${${PROJECT_NAME}_VERSION_TWEAK}
+  ${cmake_args}
   )