Apply cmake-init 0048e94130c8881fc34f940a0409adf0bc22649e

Author: scheibel

CMakeLists.txt

@@ -4,13 +4,12 @@
 # 
 
 # CMake version
-cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
 
 # Include cmake modules
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 include(GenerateExportHeader)
 include(ExternalProject)
-include(WriteCompilerDetectionHeader)
 include(cmake/GetGitRevisionDescription.cmake)
 include(cmake/Custom.cmake)
 
@@ -98,7 +97,8 @@ endif()
 if(UNIX AND SYSTEM_DIR_INSTALL)
     # Install into the system (/usr/bin or /usr/local/bin)
     set(INSTALL_ROOT      "share/${project}")       # /usr/[local]/share/<project>
-    set(INSTALL_CMAKE     "share/${project}/cmake") # /usr/[local]/share/<project>
+    set(INSTALL_CMAKE     "share/${project}/cmake") # /usr/[local]/share/<project>/cmake
+    set(INSTALL_EXAMPLES  "share/${project}")       # /usr/[local]/share/<project>
     set(INSTALL_DATA      "share/${project}")       # /usr/[local]/share/<project>
     set(INSTALL_BIN       "bin")                    # /usr/[local]/bin
     set(INSTALL_SHARED    "lib")                    # /usr/[local]/lib
@@ -112,8 +112,9 @@ else()
     # Install into local directory
     set(INSTALL_ROOT      ".")                      # ./
     set(INSTALL_CMAKE     "cmake")                  # ./cmake
-    set(INSTALL_DATA      ".")                      # ./bin
-    set(INSTALL_BIN       ".")                      # ./bin
+    set(INSTALL_EXAMPLES  ".")                      # ./
+    set(INSTALL_DATA      ".")                      # ./
+    set(INSTALL_BIN       ".")                      # ./
     set(INSTALL_SHARED    "lib")                    # ./lib
     set(INSTALL_LIB       "lib")                    # ./lib
     set(INSTALL_INCLUDE   "include")                # ./include

cmake/CompileOptions.cmake

@@ -19,7 +19,7 @@ endif()
 
 set(DEFAULT_PROJECT_OPTIONS
     DEBUG_POSTFIX             "d"
-    CXX_STANDARD              11
+    CXX_STANDARD              11 # Not available before CMake 3.1; see below for manual command line argument addition
     LINKER_LANGUAGE           "CXX"
     POSITION_INDEPENDENT_CODE ON
     CXX_VISIBILITY_PRESET     "hidden"
@@ -72,8 +72,8 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC")
 
         /wd4251       # -> disable warning: 'identifier': class 'type' needs to have dll-interface to be used by clients of class 'type2'
         /wd4592       # -> disable warning: 'identifier': symbol will be dynamically initialized (implementation limitation)
-        /wd4201       # -> disable warning: nonstandard extension used: nameless struct/union (caused by GLM)
-        /wd4127       # -> disable warning: conditional expression is constant (caused by Qt)
+        # /wd4201     # -> disable warning: nonstandard extension used: nameless struct/union (caused by GLM)
+        # /wd4127     # -> disable warning: conditional expression is constant (caused by Qt)
 
         #$<$<CONFIG:Debug>:
         #/RTCc         # -> value is assigned to a smaller data type and results in a data loss
@@ -85,6 +85,8 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC")
         /GL           # -> whole program optimization: enable link-time code generation (disables Zi)
         /GF           # -> enable string pooling
         >
+        
+        # No manual c++11 enable for MSVC as all supported MSVC versions for cmake-init have C++11 implicitly enabled (MSVC >=2013)
     )
 endif ()
 
@@ -123,6 +125,11 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCH
         $<$<PLATFORM_ID:Darwin>:
             -pthread
         >
+        
+        # Required for CMake < 3.1; should be removed if minimum required CMake version is raised.
+        $<$<VERSION_LESS:${CMAKE_VERSION},3.1>:
+            -std=c++11
+        >
     )
 endif ()
 

cmake/ComponentInstall.cmake

@@ -0,0 +1,6 @@
+
+# Execute cmake_install.cmake wrapper that allows to pass both DESTDIR and COMPONENT environment variable
+
+execute_process(
+    COMMAND ${CMAKE_COMMAND} -DCOMPONENT=$ENV{COMPONENT} -P cmake_install.cmake
+)

deploy/CMakeLists.txt

@@ -16,3 +16,15 @@ include(${PROJECT_SOURCE_DIR}/cmake/RuntimeDependencies.cmake)
 # 
 
 include(packages/pack-glkernel.cmake)
+
+
+#
+# Target 'component_install'
+#
+
+add_custom_target(
+    component_install
+    COMMAND make preinstall
+    COMMAND ${CMAKE_COMMAND} -P ${PROJECT_SOURCE_DIR}/cmake/ComponentInstall.cmake
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+)

docs/api-docs/CMakeLists.txt

@@ -30,8 +30,9 @@ set(doxyfile_in doxyfile.in)
 # 
 
 # Set project variables
-set(doxyfile     ${CMAKE_CURRENT_BINARY_DIR}/doxyfile)
-set(doxyfile_html ${CMAKE_CURRENT_BINARY_DIR}/html/index.html)
+set(doxyfile            "${CMAKE_CURRENT_BINARY_DIR}/doxyfile")
+set(doxyfile_directory  "${CMAKE_CURRENT_BINARY_DIR}/html")
+set(doxyfile_html       "${doxyfile_directory}/index.html")
 
 # Get filename and path of doxyfile
 get_filename_component(name ${doxyfile_in} NAME)
@@ -47,13 +48,24 @@ configure_file(${doxyfile_in} ${doxyfile})
 # Invoke doxygen
 add_custom_command(
     OUTPUT              ${doxyfile_html}
-    DEPENDS             ${doxyfile} ${META_PROJECT_NAME}::baselib ${META_PROJECT_NAME}::fiblib
+    DEPENDS             ${doxyfile} ${META_PROJECT_NAME}::glkernel
     WORKING_DIRECTORY   ${path}
-    COMMAND             ${CMAKE_COMMAND} -E copy_directory ${path} ${CMAKE_CURRENT_BINARY_DIR}/html # ToDO, configure doxygen to use source as is
+    COMMAND             ${CMAKE_COMMAND} -E copy_directory ${path} ${doxyfile_directory} # ToDO, configure doxygen to use source as is
     COMMAND             ${DOXYGEN} \"${doxyfile}\"
     COMMENT             "Creating doxygen documentation."
 )
 
 # Declare target
 add_custom_target(${target} ALL DEPENDS ${doxyfile_html})
 add_dependencies(docs ${target})
+
+
+# 
+# Deployment
+# 
+
+install(
+    DIRECTORY ${doxyfile_directory}
+    DESTINATION ${INSTALL_DOC}
+    COMPONENT docs
+)

source/glkernel/CMakeLists.txt

@@ -72,16 +72,6 @@ add_library(${META_PROJECT_NAME}::${target} ALIAS ${target})
 # Export library for downstream projects
 export(TARGETS ${target} NAMESPACE ${META_PROJECT_NAME}:: FILE ${PROJECT_BINARY_DIR}/cmake/${target}/${target}-export.cmake)
 
-# Create feature detection header
-# Compilers: https://cmake.org/cmake/help/v3.1/variable/CMAKE_LANG_COMPILER_ID.html#variable:CMAKE_%3CLANG%3E_COMPILER_ID
-# Feature: https://cmake.org/cmake/help/v3.1/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.html
-write_compiler_detection_header(
-    FILE ${feature_file}
-    PREFIX ${target_upper}
-    COMPILERS AppleClang Clang GNU MSVC
-    FEATURES cxx_alignas cxx_alignof cxx_constexpr cxx_final cxx_noexcept cxx_nullptr cxx_sizeof_member cxx_thread_local
-)
-
 
 # 
 # Include directories