From 720b84ef9d086245f5119d143202a2661a78ca53 Mon Sep 17 00:00:00 2001
From: Albrecht Schlosser <albrechts.fltk@online.de>
Date: Sat, 13 Jun 2020 15:19:27 +0200
Subject: CMake: refactor and reformat CMake files

- raise minimum CMake version from 2.6.3 to 3.2.3 (Jun 01, 2015)
- indent all CMake files according to the CMP (2 col.)
- refactor FLTK version number definitions and usage
- unify CMake and autoconf/configure variable names:
  - FL_VERSION -> FLTK_VERSION
  - FL_MAJOR_VERSION -> FLTK_VERSION_MAJOR
  - etc. for _MINOR_ and _PATCH_, respectively
  - note: this does not affect FL_VERSION etc. in source code
- generate "export headers" for all libraries (experimental: OFF)
- port some forgotten goodies from branch-1.3 to master
- merge and improve macro 'create_example' (WIP)
- remove "temporary" options and code for older CMake versions
- include and use 'GenerateExportHeader' (experimental, WIP: OFF)
  - note: created header files are not yet used
- build only *one* DLL with Visual Studio (tested, works)
  - similar to the bundled IDE projects in 1.3.x
- add some dynamically linked test/demo programs ('*-shared')
  if shared libraries are built (WIP)
- split 'macros.cmake': use one file per macro
---
 CMake/variables.cmake | 61 ++++++++++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 32 deletions(-)

(limited to 'CMake/variables.cmake')

diff --git a/CMake/variables.cmake b/CMake/variables.cmake
index ebafe7b10..7ff8a53e1 100644
--- a/CMake/variables.cmake
+++ b/CMake/variables.cmake
@@ -2,7 +2,7 @@
 # This file sets variables for common use in export.cmake and install.cmake
 # Written by Michael Surette
 #
-# Copyright 1998-2018 by Bill Spitzak and others.
+# Copyright 1998-2020 by Bill Spitzak and others.
 #
 # This library is free software. Distribution and use rights are outlined in
 # the file "COPYING" which should have been included with this file.  If this
@@ -16,9 +16,6 @@
 #
 
 #######################################################################
-set (FL_MAJOR_VERSION ${FLTK_VERSION_MAJOR})
-set (FL_MINOR_VERSION ${FLTK_VERSION_MINOR})
-set (FL_PATCH_VERSION ${FLTK_VERSION_PATCH})
 
 set (DEBUG_VARIABLES_CMAKE 0)
 if (DEBUG_VARIABLES_CMAKE)
@@ -83,66 +80,66 @@ set (IMAGELIBS)
 set (STATICIMAGELIBS)
 
 if (FLTK_BUILTIN_JPEG_FOUND)
-  list(APPEND IMAGELIBS -lfltk_jpeg)
-  list(APPEND STATICIMAGELIBS \$libdir/libfltk_jpeg.a)
+  list (APPEND IMAGELIBS -lfltk_jpeg)
+  list (APPEND STATICIMAGELIBS \$libdir/libfltk_jpeg.a)
 else ()
   if (LIB_jpeg)
-    list(APPEND IMAGELIBS -ljpeg)
-    list(APPEND STATICIMAGELIBS -ljpeg)
+    list (APPEND IMAGELIBS -ljpeg)
+    list (APPEND STATICIMAGELIBS -ljpeg)
   endif (LIB_jpeg)
 endif (FLTK_BUILTIN_JPEG_FOUND)
 
 if (FLTK_BUILTIN_PNG_FOUND)
-  list(APPEND IMAGELIBS -lfltk_png)
-  list(APPEND STATICIMAGELIBS \$libdir/libfltk_png.a)
+  list (APPEND IMAGELIBS -lfltk_png)
+  list (APPEND STATICIMAGELIBS \$libdir/libfltk_png.a)
 else ()
   if (LIB_png)
-    list(APPEND IMAGELIBS -lpng)
-    list(APPEND STATICIMAGELIBS -lpng)
+    list (APPEND IMAGELIBS -lpng)
+    list (APPEND STATICIMAGELIBS -lpng)
   endif (LIB_png)
 endif (FLTK_BUILTIN_PNG_FOUND)
 
 if (FLTK_BUILTIN_ZLIB_FOUND)
-  list(APPEND IMAGELIBS -lfltk_z)
-  list(APPEND STATICIMAGELIBS \$libdir/libfltk_z.a)
+  list (APPEND IMAGELIBS -lfltk_z)
+  list (APPEND STATICIMAGELIBS \$libdir/libfltk_z.a)
 else ()
   if (LIB_zlib)
-    list(APPEND IMAGELIBS -lz)
-    list(APPEND STATICIMAGELIBS -lz)
+    list (APPEND IMAGELIBS -lz)
+    list (APPEND STATICIMAGELIBS -lz)
   endif (LIB_zlib)
 endif (FLTK_BUILTIN_ZLIB_FOUND)
 
-string(REPLACE ";" " " IMAGELIBS "${IMAGELIBS}")
-string(REPLACE ";" " " STATICIMAGELIBS "${STATICIMAGELIBS}")
+string (REPLACE ";" " " IMAGELIBS "${IMAGELIBS}")
+string (REPLACE ";" " " STATICIMAGELIBS "${STATICIMAGELIBS}")
 
 #######################################################################
-set(CC ${CMAKE_C_COMPILER})
-set(CXX ${CMAKE_CXX_COMPILER})
+set (CC ${CMAKE_C_COMPILER})
+set (CXX ${CMAKE_CXX_COMPILER})
 
-set(ARCHFLAGS ${OPTION_ARCHFLAGS})
+set (ARCHFLAGS ${OPTION_ARCHFLAGS})
 
 string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_UPPER)
 if (${BUILD_UPPER})
   set (CFLAGS "${CMAKE_C_FLAGS_${BUILD_UPPER}} ${CFLAGS}")
 endif (${BUILD_UPPER})
 
-set(CFLAGS "${OPTION_OPTIM} ${CMAKE_C_FLAGS} ${CFLAGS}")
-foreach(arg ${FLTK_CFLAGS})
-  set(CFLAGS "${CFLAGS} ${arg}")
-endforeach(arg ${FLTK_CFLAGS})
+set (CFLAGS "${OPTION_OPTIM} ${CMAKE_C_FLAGS} ${CFLAGS}")
+foreach (arg ${FLTK_CFLAGS})
+  set (CFLAGS "${CFLAGS} ${arg}")
+endforeach (arg ${FLTK_CFLAGS})
 
-set(CXXFLAGS "${CFLAGS}")
+set (CXXFLAGS "${CFLAGS}")
 
-foreach(arg ${FLTK_LDLIBS})
-  set(LINK_LIBS "${LINK_LIBS} ${arg}")
-endforeach(arg ${FLTK_LDLIBS})
+foreach (arg ${FLTK_LDLIBS})
+  set (LINK_LIBS "${LINK_LIBS} ${arg}")
+endforeach (arg ${FLTK_LDLIBS})
 
-set(LIBS "${LINK_LIBS}")
+set (LIBS "${LINK_LIBS}")
 
 if (${CMAKE_SYSTEM_NAME} STREQUAL "AIX")
-    set(SHAREDSUFFIX "_s")
+    set (SHAREDSUFFIX "_s")
 else ()
-    set(SHAREDSUFFIX "")
+    set (SHAREDSUFFIX "")
 endif (${CMAKE_SYSTEM_NAME} STREQUAL "AIX")
 
 if (DEBUG_VARIABLES_CMAKE)
-- 
cgit v1.2.3