Correcting Cmake files for Windows and Visual Studio, and adding d suffix for the generated library in debug mode

ChangeLog.md

@@ -59,6 +59,8 @@
     (Roland Denis, [#1383](https://github.com/DGtal-team/DGtal/pull/1383))
   - Various warnings fixed on Xcode (David Coeurjolly,
     [#1389](https://github.com/DGtal-team/DGtal/pull/1389))
+  - Fix compilation and adding debug version for the generated file with Visual Studio
+    (Raphael Lenain, [#1395](https://github.com/DGtal-team/DGtal/pull/1395))
 
 
 - *Base*

cmake/Common.cmake

@@ -28,6 +28,13 @@ foreach(p LIB BIN INCLUDE DATA)
   endif()
 endforeach()
 
+# -----------------------------------------------------------------------------
+# Visual Studio : to distinguish between debug and release lib
+# -----------------------------------------------------------------------------
+IF (MSVC)
+  set(CMAKE_DEBUG_POSTFIX "d")
+ENDIF (MSVC)
+
 # -----------------------------------------------------------------------------
 # Doxygen targets
 # -----------------------------------------------------------------------------
@@ -52,7 +59,11 @@ ADD_CUSTOM_TARGET(uninstall
 # -----------------------------------------------------------------------------
 # Parsing cmake options
 # -----------------------------------------------------------------------------
-OPTION(BUILD_SHARED_LIBS "Build shared libraries." ON)
+IF (MSVC)
+  OPTION(BUILD_SHARED_LIBS "Build shared libraries." OFF)
+ELSE (MSVC)
+  OPTION(BUILD_SHARED_LIBS "Build shared libraries." ON)
+ENDIF (MSVC)
 OPTION(BUILD_TESTING "Build testing." OFF)
 OPTION(DEBUG_VERBOSE "Verbose debug messages." OFF)
 OPTION(VERBOSE "Verbose messages." OFF)

cmake/DGtalConfig.cmake.in

@@ -75,7 +75,7 @@ ENDIF(@COLOR_WITH_ALPHA_ARITH_DGTAL@)
 # When user or compiler have not set any std flag.
 try_compile( CPP11_COMPATIBLE_FLAG_SET_BY_USER
   ${CMAKE_BINARY_DIR}/CMakeTmp
-  @DGTAL_CMAKE_DIR@/cpp11_check.cpp
+  "@DGTAL_CMAKE_DIR@/cpp11_check.cpp"
   CMAKE_FLAGS "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}"
   OUTPUT_VARIABLE OUTPUT
   )
@@ -120,7 +120,7 @@ ENDIF(@HDF5_FOUND_DGTAL@)
 if (@QGLVIEWER_FOUND_DGTAL@)
   add_definitions("-DWITH_VISU3D_QGLVIEWER ")
   set(WITH_VISU3D_QGLVIEWER 1)
-  set(DGTAL_INCLUDE_DIRS ${DGTAL_INCLUDE_DIRS} @QGLVIEWER_INCLUDE_DIR@)
+  set(DGTAL_INCLUDE_DIRS ${DGTAL_INCLUDE_DIRS} "@QGLVIEWER_INCLUDE_DIR@")
 endif (@QGLVIEWER_FOUND_DGTAL@)
 
 #-- We force the Qt rediscovering
@@ -130,7 +130,7 @@ if (@QT4_FOUND_DGTAL@)
   add_definitions("-DWITH_QT4")
   set(WITH_QT4 1)
   include(${QT_USE_FILE})
-  set(DGTAL_INCLUDE_DIRS ${DGTAL_INCLUDE_DIRS} ${QT_INCLUDE_DIR})
+  set(DGTAL_INCLUDE_DIRS ${DGTAL_INCLUDE_DIRS} "${QT_INCLUDE_DIR}")
 endif (@QT4_FOUND_DGTAL@)
 
 if (@QT5_FOUND_DGTAL@)
@@ -139,9 +139,9 @@ if (@QT5_FOUND_DGTAL@)
   set(WITH_QT5 1)
   set(Qt5_DIR @Qt5_DIR@)
   set(DGTAL_INCLUDE_DIRS ${DGTAL_INCLUDE_DIRS}
-                         ${Qt5Widgets_INCLUDE_DIRS}
-                         ${Qt5OpenGL_INCLUDE_DIRS}
-                         ${Qt5Xml_INCLUDE_DIRS})
+                         "${Qt5Widgets_INCLUDE_DIRS}"
+                         "${Qt5OpenGL_INCLUDE_DIRS}"
+                         "${Qt5Xml_INCLUDE_DIRS}")
 endif (@QT5_FOUND_DGTAL@)
 
 IF(@OPENMP_FOUND_DGTAL@)
@@ -156,7 +156,7 @@ ENDIF(@OPENMP_FOUND_DGTAL@)
 IF(@EIGEN_FOUND_DGTAL@)
   ADD_DEFINITIONS("-DWITH_EIGEN ")
   SET(WITH_EIGEN 1)
-  SET(DGTAL_INCLUDE_DIRS ${DGTAL_INCLUDE_DIRS} @EIGEN3_INCLUDE_DIR@ )
+  SET(DGTAL_INCLUDE_DIRS ${DGTAL_INCLUDE_DIRS} "@EIGEN3_INCLUDE_DIR@" )
 ENDIF(@EIGEN_FOUND_DGTAL@)
 
 

cmake/FindFFTW3.cmake

@@ -24,7 +24,9 @@ find_library (FFTW3_LONG_THREADS_LIBRARIES   NAMES fftw3l_threads )
 # Gathering FFTW3 libraries
 set (FFTW3_LIBRARIES ${FFTW3_FLOAT_LIBRARIES} ${FFTW3_DOUBLE_LIBRARIES} ${FFTW3_LONG_LIBRARIES})
 set (FFTW3_THREADS_LIBRARIES ${FFTW3_FLOAT_THREADS_LIBRARIES} ${FFTW3_DOUBLE_THREADS_LIBRARIES} ${FFTW3_LONG_THREADS_LIBRARIES})
-set (FFTW3_DEP_LIBRARIES m)
+if (NOT MSVC)
+  set (FFTW3_DEP_LIBRARIES m)
+endif (NOT MSVC)
 
 # Telling which FFT precisions are found.
 include(FindPackageHandleStandardArgs)
@@ -36,7 +38,9 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(FFTW3_LONG   DEFAULT_MSG FFTW3_INCLUDE_DIR FFT
 # Adding threaded version of FFTW3
 if (FFTW3_THREADS_LIBRARIES)
   set (FFTW3_LIBRARIES ${FFTW3_LIBRARIES} ${FFTW3_THREADS_LIBRARIES})
-  set (FFTW3_DEP_LIBRARIES ${FFTW3_DEP_LIBRARIES} pthread)
+  if (NOT MSVC)
+    set (FFTW3_DEP_LIBRARIES ${FFTW3_DEP_LIBRARIES} pthread)
+  endif (NOT MSVC)
 endif (FFTW3_THREADS_LIBRARIES)
 
 

cmake/TargetDoxygenDox.cmake

@@ -65,8 +65,8 @@ IF (DOXYGEN_FOUND)
       SET (TMP "${CMAKE_CURRENT_BINARY_DIR}\\Doc\\html\\index.hhp")
       STRING(REGEX REPLACE "[/]" "\\\\" HHP_FILE ${TMP} )
       # MESSAGE(SEND_ERROR "DBG  HHP_FILE=${HHP_FILE}")
-      ADD_CUSTOM_TARGET(winhelp ${HTML_HELP_COMPILER} ${HHP_FILE})
-      ADD_DEPENDENCIES (winhelp doc)
+      ADD_CUSTOM_TARGET(winhelp-dox ${HTML_HELP_COMPILER} ${HHP_FILE})
+      ADD_DEPENDENCIES (winhelp-dox dox)
 
       IF (NOT TARGET_DOC_SKIP_INSTALL)
       # install windows help?

examples/tutorial-examples/CMakeLists.txt

@@ -13,6 +13,10 @@ SET(DGTAL_TUTO_EXAMPLES_SRC
 
 
 FOREACH(FILE ${DGTAL_TUTO_EXAMPLES_SRC})
+  if(MSVC)
+    set_source_files_properties( ${FILE} PROPERTIES COMPILE_FLAGS "/bigobj" )
+  endif(MSVC)
+
   add_executable(${FILE} ${FILE})
   target_link_libraries (${FILE} DGtal  )
 ENDFOREACH(FILE)