CMake enhancements, as discussed in STR #3055.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10342 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

7 files changed, 138 insertions, 200 deletions

diff --git a/CMake/FLTKConfig.cmake.in b/CMake/FLTKConfig.cmake.in
index 8adc8233e..baa25a6d2 100644
--- a/CMake/FLTKConfig.cmake.in
+++ b/CMake/FLTKConfig.cmake.in
@@ -1,49 +1,16 @@
 #
 # FLTKConfig.cmake - FLTK CMake configuration file for external projects.
 #
-# This file is configured by FLTK and used by the UseFLTK.cmake module
-# to load FLTK's settings for an external project.
+# This file is generated by CMake and used to load FLTK's settings for an external project.
+# It defines the following variables
+#  FLTK_INCLUDE_DIRS - FLTK include directories
+#  FLTK_LIBRARIES    - list of FLTK libraries built
+#  FLTK_FLUID_EXECUTABLE needed by fltk_wrap_ui()
+#  FLTK_USE_FILE - sets things up to use FLTK
 
-set(FLTK_FOUND TRUE)
 set(FLTK_VERSION @FLTK_VERSION_FULL@)
 
-set(FLTK_FLUID_EXECUTABLE "@FLTK_FLUID_PATH@")
+include(${CMAKE_CURRENT_LIST_DIR}/FLTK-Targets.cmake)
 
-if("@EXE_LINKER_FLAGS@" MATCHES "[-_A-Za-z0-9]+"))
-   set(FLTK_EXE_LINKER_FLAGS "@EXE_LINKER_FLAGS@")
-endif("@EXE_LINKER_FLAGS@" MATCHES "[-_A-Za-z0-9]+")
-
-set(FLTK_USE_FILE "@PREFIX_CONFIG@/UseFLTK.cmake")
-
-set(FLTK_DIR "@PREFIX_CONFIG@")
-
-set(FLTK_BIN_DIR "@PREFIX_BIN@")
-set(FLTK_LIB_DIR "@PREFIX_LIB@")
-set(FLTK_INCLUDE_DIR "@PREFIX_INCLUDE@")
-set(FLTK_DATA_DIR "@PREFIX_DATA@")
-set(FLTK_DOC_DIR "@PREFIX_DOC@")
-
-set(FLTK_SHARED_LIBS_FOUND @OPTION_BUILD_SHARED_LIBS@)
-set(FLTK_CAIRO_FOUND @FLTK_CAIRO_FOUND@)
-set(FLTK_GL_FOUND @FLTK_GL_FOUND@)
-set(FLTK_THREADS_FOUND @FLTK_THREADS_FOUND@)
-set(FLTK_PTHREADS_FOUND @FLTK_PTHREADS_FOUND@)
-set(FLTK_BUILTIN_JPEG_FOUND @FLTK_BUILTIN_JPEG_FOUND@)
-set(FLTK_BUILTIN_ZLIB_FOUND @FLTK_BUILTIN_ZLIB_FOUND@)
-set(FLTK_BUILTIN_PNG_FOUND @FLTK_BUILTIN_PNG_FOUND@)
-set(FLTK_XINERAMA_FOUND @FLTK_XINERAMA_FOUND@)
-set(FLTK_XFT_FOUND @FLTK_XFT_FOUND@)
-set(FLTK_XDBE_FOUND @FLTK_XDBE_FOUND@)
-
-set(FLTK_CAIRO_FOUND @FLTK_CAIRO_FOUND@)
-set(FLTK_GL_FOUND @FLTK_GL_FOUND@)
-set(FLTK_THREADS_FOUND @FLTK_THREADS_FOUND@)
-set(FLTK_PTHREADS_FOUND @FLTK_PTHREADS_FOUND@)
-set(FLTK_BUILTIN_JPEG_FOUND @FLTK_BUILTIN_JPEG_FOUND@)
-set(FLTK_BUILTIN_ZLIB_FOUND @FLTK_BUILTIN_ZLIB_FOUND@)
-set(FLTK_BUILTIN_PNG_FOUND @FLTK_BUILTIN_PNG_FOUND@)
-set(FLTK_XINERAMA_FOUND @FLTK_XINERAMA_FOUND@)
-set(FLTK_XFT_FOUND @FLTK_XFT_FOUND@)
-set(FLTK_XDBE_FOUND @FLTK_XDBE_FOUND@)
-
-include("@PREFIX_CONFIG@/FLTKLibraries.cmake")
+set(FLTK_INCLUDE_DIRS "@INCLUDE_DIRS@")
+set(FLTK_USE_FILE ${CMAKE_CURRENT_LIST_DIR}/UseFLTK.cmake)
diff --git a/CMake/UseFLTK.cmake.in b/CMake/UseFLTK.cmake.in
index 9518d26ba..ed26f8815 100644
--- a/CMake/UseFLTK.cmake.in
+++ b/CMake/UseFLTK.cmake.in
@@ -1,8 +1,25 @@
 #
+# UseFLTK.CMake - FLTK CMake environment configuration file for external projects.
+#
+# This file is generated by CMake and used to set FLTK's environment for an external project.
+#
 # automatically generated - do not edit
 
-include_directories("@PREFIX_INCLUDE@")
+include_directories("@INCLUDE_DIRS@")
+
+if(CMAKE_CROSSCOMPILING)
+   find_file(FLUID_PATH
+      NAMES fluid fluid.exe
+      PATHS ENV PATH
+      NO_CMAKE_FIND_ROOT_PATH
+   )
+   add_executable(fluid IMPORTED)
+   set_target_properties(fluid
+      PROPERTIES IMPORTED_LOCATION ${FLUID_PATH}
+   )
+   set(FLTK_FLUID_EXECUTABLE ${FLUID_PATH})
+else()
+   set(FLTK_FLUID_EXECUTABLE fluid)
+endif(CMAKE_CROSSCOMPILING)
 
-if(FLTK_EXE_LINKER_FLAGS)
-   list(APPEND CMAKE_EXE_LINKER_FLAGS "${FLTK_EXE_LINKER_FLAGS}")
-endif(FLTK_EXE_LINKER_FLAGS)
+set(FLTK_WRAP_UI TRUE)
diff --git a/CMake/export.cmake b/CMake/export.cmake
index 50aa79556..f022002f8 100644
--- a/CMake/export.cmake
+++ b/CMake/export.cmake
@@ -29,30 +29,35 @@ if(CMAKE_CROSSCOMPILING)
    )
    add_executable(fluid IMPORTED)
    set(FLTK_FLUID_EXECUTABLE ${FLUID_PATH})
-   set(FLTK_FLUID_PATH ${FLUID_PATH})
+   set(FLUID)       # no export
    set_target_properties(fluid
       PROPERTIES IMPORTED_LOCATION ${FLUID_PATH}
    )
 else()
    add_subdirectory(fluid)
    set(FLTK_FLUID_EXECUTABLE fluid)
-   set(FLTK_FLUID_PATH ${PREFIX_BIN}/fluid)
+   set(FLUID fluid) # export
 endif(CMAKE_CROSSCOMPILING)
 
 add_subdirectory(src)
 
-# generate FLTKConfig.cmake
-string(REPLACE ";" " " EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
+# generate FLTK-Targets.cmake for build directory use
+export(TARGETS ${FLUID} ${FLTK_LIBRARIES} FILE ${CMAKE_BINARY_DIR}/FLTK-Targets.cmake)
+
+# generate FLTKConfig.cmake for build directory use
+set(INCLUDE_DIRS "@FLTK_INCLUDE_DIRS@")
+set(CONFIG_PATH @FLTK_BINARY_DIR@)
+
 configure_file(
    ${FLTK_SOURCE_DIR}/CMake/FLTKConfig.cmake.in
-   ${EXECUTABLE_OUTPUT_PATH}/FLTKConfig.cmake
+   ${FLTK_BINARY_DIR}/FLTKConfig.cmake
    @ONLY
 )
 
-# generate UseFLTK.cmake
+# generate UseFLTK.cmake for build directory use
 configure_file(
    ${FLTK_SOURCE_DIR}/CMake/UseFLTK.cmake.in
-   ${EXECUTABLE_OUTPUT_PATH}/UseFLTK.cmake
+   ${FLTK_BINARY_DIR}/UseFLTK.cmake
    @ONLY
 )
 
@@ -92,4 +97,3 @@ if(OPTION_CREATE_LINKS)
       @ONLY
    )
 endif(OPTION_CREATE_LINKS)
-#
diff --git a/CMake/install.cmake b/CMake/install.cmake
index e8684906d..4df09820b 100644
--- a/CMake/install.cmake
+++ b/CMake/install.cmake
@@ -32,7 +32,7 @@ add_custom_target(uninstall
 )
 
 install(DIRECTORY ${FLTK_SOURCE_DIR}/FL
-   DESTINATION ${PREFIX_INCLUDE} USE_SOURCE_PERMISSIONS
+   DESTINATION include USE_SOURCE_PERMISSIONS
    PATTERN ".svn" EXCLUDE
 )
 
@@ -40,29 +40,41 @@ if(OPTION_CREATE_LINKS)
    install(SCRIPT ${FLTK_BINARY_DIR}/install-symlinks.cmake)
 endif(OPTION_CREATE_LINKS)
 
-install(PROGRAMS ${FLTK_BINARY_DIR}/fltk-config
-   DESTINATION ${PREFIX_BIN}
-   OPTIONAL
+# generate FLTKConfig.cmake for installed directory use
+set(INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include)
+
+set(CONFIG_PATH ${CMAKE_INSTALL_PREFIX}/@FLTK_CONFIG_PATH@)
+
+install(EXPORT FLTK-Targets
+   DESTINATION ${FLTK_CONFIG_PATH}
+   FILE FLTK-Targets.cmake
+)
+
+configure_file(
+   ${FLTK_SOURCE_DIR}/CMake/FLTKConfig.cmake.in
+   ${FLTK_BINARY_DIR}/etc/FLTKConfig.cmake
+   @ONLY
 )
 
-install(EXPORT fltk-install
-   DESTINATION ${PREFIX_CONFIG}
-   FILE FLTKLibraries.cmake
+install(FILES ${FLTK_BINARY_DIR}/etc/FLTKConfig.cmake
+   DESTINATION ${FLTK_CONFIG_PATH}
 )
 
-install(FILES ${EXECUTABLE_OUTPUT_PATH}/FLTKConfig.cmake
-   DESTINATION ${PREFIX_CONFIG}
+configure_file(
+   ${FLTK_SOURCE_DIR}/CMake/UseFLTK.cmake.in
+   ${FLTK_BINARY_DIR}/etc/UseFLTK.cmake
+   @ONLY
 )
 
-install(FILES ${EXECUTABLE_OUTPUT_PATH}/UseFLTK.cmake
-   DESTINATION ${PREFIX_CONFIG}
+install(FILES ${FLTK_BINARY_DIR}/etc/UseFLTK.cmake
+   DESTINATION ${FLTK_CONFIG_PATH}
 )
 
-if(CMAKE_HOST_UNIX)
+if(UNIX)
    macro(INSTALL_MAN FILE LEVEL)
    install(FILES
       ${FLTK_SOURCE_DIR}/documentation/src/${FILE}.man
-      DESTINATION ${PREFIX_MAN}/man${LEVEL}
+      DESTINATION man/man${LEVEL}
       RENAME ${FILE}.${LEVEL}
    )
    endmacro(INSTALL_MAN FILE LEVEL)
@@ -74,4 +86,4 @@ if(CMAKE_HOST_UNIX)
    INSTALL_MAN(checkers 6)
    INSTALL_MAN(sudoku 6)
 
-endif(CMAKE_HOST_UNIX)
+endif(UNIX)
diff --git a/CMake/options.cmake b/CMake/options.cmake
index 62822444f..13931d178 100644
--- a/CMake/options.cmake
+++ b/CMake/options.cmake
@@ -34,114 +34,24 @@ set(OPTION_ARCHFLAGS ""
 add_definitions(${OPTION_ARCHFLAGS})
 
 #######################################################################
-set(OPTION_PREFIX_BIN ""
-   CACHE STRING
-   "where to install executables - leave empty to use {CMAKE_INSTALL_PREFIX}/bin"
-   )
-
-if(OPTION_PREFIX_BIN)
-   set(PREFIX_BIN ${OPTION_PREFIX_BIN} CACHE INTERNAL "" FORCE)
-else()
-   set(PREFIX_BIN ${CMAKE_INSTALL_PREFIX}/bin CACHE INTERNAL "" FORCE)
-endif(OPTION_PREFIX_BIN)
-
-#######################################################################
-set(OPTION_PREFIX_LIB ""
-   CACHE STRING
-   "where to install libraries - leave empty to use {CMAKE_INSTALL_PREFIX}/lib"
-   )
-
-if(OPTION_PREFIX_LIB)
-   set(PREFIX_LIB ${OPTION_PREFIX_LIB} CACHE INTERNAL "" FORCE)
-else()
-   set(PREFIX_LIB ${CMAKE_INSTALL_PREFIX}/lib CACHE INTERNAL "" FORCE)
-endif(OPTION_PREFIX_LIB)
-
 #######################################################################
-set(OPTION_PREFIX_INCLUDE ""
-   CACHE STRING
-   "where to install include files - leave empty to use {CMAKE_INSTALL_PREFIX}/include"
-   )
-
-if(OPTION_PREFIX_INCLUDE)
-   set(PREFIX_INCLUDE ${OPTION_PREFIX_INCLUDE} CACHE INTERNAL "" FORCE)
-else()
-   set(PREFIX_INCLUDE ${CMAKE_INSTALL_PREFIX}/include CACHE INTERNAL "" FORCE)
-endif(OPTION_PREFIX_INCLUDE)
-
-#######################################################################
-set(OPTION_PREFIX_DATA ""
-   CACHE STRING
-   "where to install data files - leave empty to use {CMAKE_INSTALL_PREFIX}/share/FLTK"
-   )
-
-if(OPTION_PREFIX_DATA)
-   set(PREFIX_DATA ${OPTION_PREFIX_DATA} CACHE INTERNAL "" FORCE)
-else()
-   set(PREFIX_DATA ${CMAKE_INSTALL_PREFIX}/share/FLTK CACHE INTERNAL "" FORCE)
-endif(OPTION_PREFIX_DATA)
-
-#######################################################################
-set(OPTION_PREFIX_DOC ""
-   CACHE STRING
-   "where to install doc files - leave empty to use {CMAKE_INSTALL_PREFIX}/share/doc/FLTK"
-   )
-
-if(OPTION_PREFIX_DOC)
-   set(PREFIX_DOC ${OPTION_PREFIX_DOC} CACHE INTERNAL "" FORCE)
-else()
-   set(PREFIX_DOC ${CMAKE_INSTALL_PREFIX}/share/doc/FLTK CACHE INTERNAL "" FORCE)
-endif(OPTION_PREFIX_DOC)
-
-#######################################################################
-if(WIN32)
-   set(DEFAULT_CONFIG "${CMAKE_INSTALL_PREFIX}/CMake")
-elseif(APPLE)
-   set(DEFAULT_CONFIG "${CMAKE_INSTALL_PREFIX}/FLTK/.framework/Resources/CMake")
-else()
-   set(DEFAULT_CONFIG "${CMAKE_INSTALL_PREFIX}/lib/FLTK-${FLTK_VERSION}")
-endif(WIN32)
-
-set(OPTION_PREFIX_CONFIG ""
-   CACHE STRING
-   "where to install CMake config files - leave empty to use ${DEFAULT_CONFIG}"
-   )
-
-if(OPTION_PREFIX_CONFIG)
-   set(PREFIX_CONFIG "${OPTION_PREFIX_CONFIG}" CACHE INTERNAL "" FORCE)
-else()
-   set(PREFIX_CONFIG "${DEFAULT_CONFIG}" CACHE INTERNAL "" FORCE)
-endif(OPTION_PREFIX_CONFIG)
-
-#######################################################################
-if(CMAKE_HOST_UNIX)
-   set(OPTION_PREFIX_MAN ""
-      CACHE STRING
-      "where to install man files - leave empty to use {CMAKE_INSTALL_PREFIX}/man"
-      )
-
-   if(OPTION_PREFIX_MAN)
-      set(PREFIX_MAN ${OPTION_PREFIX_MAN} CACHE INTERNAL "" FORCE)
-   else()
-      set(PREFIX_MAN ${CMAKE_INSTALL_PREFIX}/man CACHE INTERNAL "" FORCE)
-   endif(OPTION_PREFIX_MAN)
-
+if(UNIX)
    option(OPTION_CREATE_LINKS "create backwards compatibility links" OFF)
-endif(CMAKE_HOST_UNIX)
+endif(UNIX)
 
 #######################################################################
 if(APPLE)
    option(OPTION_APPLE_X11 "use X11" OFF)
 endif(APPLE)
 
-if(NOT APPLE OR OPTION_APPLE_X11)
+if((NOT APPLE OR OPTION_APPLE_X11) AND NOT WIN32)
    include(FindX11)
    if(X11_FOUND)
       set(USE_X11 1)
       list(APPEND FLTK_CFLAGS -DUSE_X11)
       list(APPEND FLTK_LDLIBS -lX11)
    endif(X11_FOUND)
-endif(NOT APPLE OR OPTION_APPLE_X11)
+endif((NOT APPLE OR OPTION_APPLE_X11) AND NOT WIN32)
 
 #######################################################################
 option(OPTION_USE_POLL "use poll if available" OFF)
@@ -151,7 +61,10 @@ if(OPTION_USE_POLL)
 endif(OPTION_USE_POLL)
 
 #######################################################################
-option(OPTION_BUILD_SHARED_LIBS "Build shared libraries" OFF)
+option(OPTION_BUILD_SHARED_LIBS
+    "Build shared libraries(in addition to static libraries)"
+    OFF
+    )
 
 #######################################################################
 option(OPTION_BUILD_EXAMPLES "build example programs" ON)
@@ -241,30 +154,6 @@ if(OPTION_LARGE_FILE)
 endif(OPTION_LARGE_FILE)
 
 #######################################################################
-option(OPTION_USE_SYSTEM_LIBJPEG "Use's system libjpeg" ON)
-
-if(OPTION_USE_SYSTEM_LIBJPEG AND LIB_jpeg)
-   include(FindJPEG)
-endif(OPTION_USE_SYSTEM_LIBJPEG AND LIB_jpeg)
-
-if(OPTION_USE_SYSTEM_LIBJPEG AND JPEG_FOUND)
-   set(FLTK_JPEG_LIBRARIES ${JPEG_LIBRARIES})
-   include_directories(${JPEG_INCLUDE_DIR})
-   set(FLTK_BUILTIN_JPEG_FOUND FALSE)
-else()
-   add_subdirectory(jpeg)
-   set(FLTK_JPEG_LIBRARIES fltk_jpeg)
-   include_directories(${FLTK_SOURCE_DIR}/jpeg)
-   set(FLTK_BUILTIN_JPEG_FOUND TRUE)
-endif(OPTION_USE_SYSTEM_LIBJPEG AND JPEG_FOUND)
-
-if(OPTION_USE_SYSTEM_LIBJPEG AND NOT JPEG_FOUND)
-   message(STATUS "\ncannot find system jpeg library - using built-in\n")
-endif(OPTION_USE_SYSTEM_LIBJPEG AND NOT JPEG_FOUND)
-
-set(HAVE_LIBJPEG 1)
-
-#######################################################################
 option(OPTION_USE_SYSTEM_ZLIB "Use's system zlib" ON)
 
 if(OPTION_USE_SYSTEM_ZLIB AND LIB_zlib)
@@ -290,6 +179,30 @@ endif(OPTION_USE_SYSTEM_ZLIB AND NOT ZLIB_FOUND)
 set(HAVE_LIBZ 1)
 
 #######################################################################
+option(OPTION_USE_SYSTEM_LIBJPEG "Use's system libjpeg" ON)
+
+if(OPTION_USE_SYSTEM_LIBJPEG AND LIB_jpeg)
+   include(FindJPEG)
+endif(OPTION_USE_SYSTEM_LIBJPEG AND LIB_jpeg)
+
+if(OPTION_USE_SYSTEM_LIBJPEG AND JPEG_FOUND)
+   set(FLTK_JPEG_LIBRARIES ${JPEG_LIBRARIES})
+   include_directories(${JPEG_INCLUDE_DIR})
+   set(FLTK_BUILTIN_JPEG_FOUND FALSE)
+else()
+   add_subdirectory(jpeg)
+   set(FLTK_JPEG_LIBRARIES fltk_jpeg)
+   include_directories(${FLTK_SOURCE_DIR}/jpeg)
+   set(FLTK_BUILTIN_JPEG_FOUND TRUE)
+endif(OPTION_USE_SYSTEM_LIBJPEG AND JPEG_FOUND)
+
+if(OPTION_USE_SYSTEM_LIBJPEG AND NOT JPEG_FOUND)
+   message(STATUS "\ncannot find system jpeg library - using built-in\n")
+endif(OPTION_USE_SYSTEM_LIBJPEG AND NOT JPEG_FOUND)
+
+set(HAVE_LIBJPEG 1)
+
+#######################################################################
 option(OPTION_USE_SYSTEM_LIBPNG "Use's system libpng" ON)
 
 if(OPTION_USE_SYSTEM_LIBPNG AND LIB_png)
diff --git a/CMake/resources.cmake b/CMake/resources.cmake
index dbd19f8d0..5fe4063f5 100644
--- a/CMake/resources.cmake
+++ b/CMake/resources.cmake
@@ -24,7 +24,7 @@
 find_file(HAVE_ALSA_ASOUNDLIB_H alsa/asoundlib.h)
 find_file(HAVE_DIRENT_H dirent.h)
 find_file(HAVE_DLFCN_H dlfcn.h)
-find_file(HAVE_FREETYPE_H freetype.h PATH_SUFFIXES freetype2)
+find_file(HAVE_FREETYPE_H freetype.h PATH_SUFFIXES freetype2 freetype2/freetype)
 find_file(HAVE_GL_GL_H GL/gl.h)
 find_file(HAVE_GL_GLU_H GL/glu.h)
 find_file(HAVE_LIBPNG_PNG_H libpng/png.h)
@@ -51,6 +51,7 @@ mark_as_advanced(HAVE_SYS_STDTYPES_H HAVE_XDBE_H)
 
 # where to find freetype headers
 find_path(FREETYPE_PATH freetype.h PATH_SUFFIXES freetype2)
+find_path(FREETYPE_PATH freetype/freetype.h PATH_SUFFIXES freetype2)
 if(FREETYPE_PATH)
    include_directories(${FREETYPE_PATH})
 endif(FREETYPE_PATH)
diff --git a/CMake/setup.cmake b/CMake/setup.cmake
index b6355ac61..a44f344f2 100644
--- a/CMake/setup.cmake
+++ b/CMake/setup.cmake
@@ -34,18 +34,39 @@ set(ARCHIVE_OUTPUT_PATH ${FLTK_BINARY_DIR}/lib)
 # Search for modules in the FLTK source dir first
 set(CMAKE_MODULE_PATH "${FLTK_SOURCE_DIR}/CMake")
 
-include_directories(${FLTK_BINARY_DIR} ${FLTK_SOURCE_DIR})
+set(FLTK_INCLUDE_DIRS ${FLTK_BINARY_DIR} ${FLTK_SOURCE_DIR})
+include_directories(${FLTK_INCLUDE_DIRS})
 
 #######################################################################
 # platform dependent information
 #######################################################################
 
+# fix no WIN32 defined issue
+if(NOT WIN32)
+    if(_WIN32)
+        set(WIN32 _WIN32)
+    elseif(__WIN32__)
+        set(WIN32 __WIN32__)
+    endif(_WIN32)
+endif(NOT WIN32)
+
+# set where config and example files go
+if(WIN32 AND NOT CYGWIN)
+   set(FLTK_CONFIG_PATH CMake)
+   set(FLTK_EXAMPLES_PATH bin/fltk-examples)
+elseif(APPLE)
+   set(FLTK_CONFIG_PATH FLTK/.framework/Resources/CMake)
+   set(FLTK_EXAMPLES_PATH share/fltk-examples)
+else()
+   set(FLTK_CONFIG_PATH lib/fltk)
+   set(FLTK_EXAMPLES_PATH share/fltk-examples)
+endif(WIN32 AND NOT CYGWIN)
+
 include(TestBigEndian)
 TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
 
 if(APPLE)
    set(__APPLE_QUARTZ__ 1)
-   set(HAVE_STRTOLL 1)
    set(HAVE_STRCASECMP 1)
    set(HAVE_DIRENT_H 1)
    set(HAVE_SNPRINTF 1)
@@ -57,16 +78,19 @@ if(APPLE)
 endif(APPLE)
 
 if(WIN32)
-   if(MSVC)
-      add_definitions(-DWIN32_LEAN_AND_MEAN)
-      add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-   endif(MSVC)
-   if(CMAKE_C_COMPILER_ID STREQUAL GNU)
-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-subsystem,windows")
-   endif(CMAKE_C_COMPILER_ID STREQUAL GNU)
-   if(MINGW AND EXISTS /mingw)
-      list(APPEND CMAKE_PREFIX_PATH /mingw)
-   endif(MINGW AND EXISTS /mingw)
+    if(MSVC)
+        add_definitions(-DWIN32_LEAN_AND_MEAN)
+        add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+######## from ide/VisualC2010/config.h
+        set(BORDER_WIDTH 2)
+########
+    endif(MSVC)
+    if(CMAKE_C_COMPILER_ID STREQUAL GNU)
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-subsystem,windows")
+    endif(CMAKE_C_COMPILER_ID STREQUAL GNU)
+    if(MINGW AND EXISTS /mingw)
+        list(APPEND CMAKE_PREFIX_PATH /mingw)
+    endif(MINGW AND EXISTS /mingw)
 endif(WIN32)
 
 #######################################################################