Apply cmake-init fcfcec92f6974734b0ebb78c8ba521e9dd93ed5c

Author: scheibel

CMakeLists.txt

@@ -9,11 +9,17 @@ cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
 # Include cmake modules
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-set(WriterCompilerDetectionHeaderFound NOTFOUND)
+
 
 include(GenerateExportHeader)
-include(ExternalProject)
-include(WriteCompilerDetectionHeader OPTIONAL RESULT_VARIABLE WriterCompilerDetectionHeaderFound)
+
+set(WriterCompilerDetectionHeaderFound NOTFOUND)
+# This module is only available with CMake >=3.1, so check whether it could be found
+# BUT in CMake 3.1 this module doesn't recognize AppleClang as compiler, so just use it as of CMake 3.2
+if (${CMAKE_VERSION} VERSION_GREATER "3.2")
+    include(WriteCompilerDetectionHeader OPTIONAL RESULT_VARIABLE WriterCompilerDetectionHeaderFound)
+endif()
+
 include(cmake/GetGitRevisionDescription.cmake)
 include(cmake/Custom.cmake)
 
@@ -45,6 +51,9 @@ set(META_VERSION_REVISION    "${GIT_REV}")
 set(META_VERSION             "${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH}")
 set(META_NAME_VERSION        "${META_PROJECT_NAME} v${META_VERSION} (${META_VERSION_REVISION})")
 
+string(MAKE_C_IDENTIFIER ${META_PROJECT_NAME} META_PROJECT_ID)
+string(TOUPPER ${META_PROJECT_ID} META_PROJECT_ID)
+
 
 # 
 # Project configuration options
@@ -65,7 +74,7 @@ option(OPTION_ERRORS_AS_EXCEPTION "Throw exceptions instead of printing OpenGL r
 
 # Generate folders for IDE targets (e.g., VisualStudio solutions)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-set(IDE_FOLDER "")  
+set(IDE_FOLDER "")
 
 # Declare project
 project(${META_PROJECT_NAME} C CXX)

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"
@@ -66,6 +66,7 @@ set(DEFAULT_COMPILE_OPTIONS)
 # MSVC compiler options
 if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC")
     set(DEFAULT_COMPILE_OPTIONS ${DEFAULT_COMPILE_OPTIONS}
+    PRIVATE
         /MP           # -> build with multiple processes
         /W4           # -> warning level 4
         # /WX         # -> treat warnings as errors
@@ -85,12 +86,19 @@ 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)
+
+    PUBLIC
     )
 endif ()
 
 # GCC and Clang compiler options
 if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
     set(DEFAULT_COMPILE_OPTIONS ${DEFAULT_COMPILE_OPTIONS}
+    PRIVATE
+        #-fno-exceptions # since we use stl and stl is intended to use exceptions, exceptions should not be disabled
+        
         -Wall
         -Wextra
         -Wunused
@@ -124,6 +132,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCH
             -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
         >
@@ -140,6 +149,7 @@ set(DEFAULT_LINKER_OPTIONS)
 # Use pthreads on mingw and linux
 if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" OR "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
     set(DEFAULT_LINKER_OPTIONS
+    PUBLIC
         -pthread
     )
 endif()

cmake/Custom.cmake

@@ -13,7 +13,7 @@ endfunction(set_policy)
 # to group source files in folders (e.g. for MSVC solutions).
 #
 # Example:
-# source_group_by_path("${CMAKE_CURRENT_SOURCE_DIR}/src" "\\\\.h$|\\\\.hpp$|\\\\.cpp$|\\\\.c$|\\\\.ui$|\\\\.qrc$" "Source Files" ${sources})
+# source_group_by_path("${CMAKE_CURRENT_SOURCE_DIR}/src" "\\\\.h$|\\\\.inl$|\\\\.cpp$|\\\\.c$|\\\\.ui$|\\\\.qrc$" "Source Files" ${sources})
 function(source_group_by_path PARENT_PATH REGEX GROUP)
 
     foreach (FILENAME ${ARGN})

globjects-config.cmake

@@ -1,6 +1,6 @@
 
 # This config script tries to locate the project either in its source tree
-# of from an install location.
+# or from an install location.
 # 
 # Please adjust the list of submodules to search for.
 
@@ -36,5 +36,10 @@ if(MODULE_FOUND)
 endif()
 
 # Try common build locations
-find_modules("build/cmake")
-find_modules("build-debug/cmake")
+if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+    find_modules("build-debug/cmake")
+    find_modules("build/cmake")
+else()
+    find_modules("build/cmake")
+    find_modules("build-debug/cmake")
+endif()

source/CMakeLists.txt

@@ -4,7 +4,6 @@
 # 
 
 # Generate version-header
-string(TOUPPER ${META_PROJECT_NAME} META_PROJECT_NAME_UPPER)
 configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/${META_PROJECT_NAME}/${META_PROJECT_NAME}-version.h)
 
 

source/globjects/CMakeLists.txt

@@ -17,10 +17,11 @@ set(target globjects)
 message(STATUS "Lib ${target}")
 
 # Set API export file and macro
-string(TOUPPER ${target} target_upper)
+string(MAKE_C_IDENTIFIER ${target} target_id)
+string(TOUPPER ${target_id} target_id)
 set(feature_file "include/${target}/${target}_features.h")
 set(export_file  "include/${target}/${target}_api.h")
-set(export_macro "${target_upper}_API")
+set(export_macro "${target_id}_API")
 
 
 # 
@@ -301,7 +302,7 @@ generate_export_header(${target}
 if (WriterCompilerDetectionHeaderFound)
     write_compiler_detection_header(
         FILE ${feature_file}
-        PREFIX ${target_upper}
+        PREFIX ${target_id}
         COMPILERS AppleClang Clang GNU MSVC
         FEATURES cxx_thread_local
         VERSION 3.2
@@ -371,7 +372,7 @@ target_compile_definitions(${target}
 
     PUBLIC
     GLM_FORCE_RADIANS
-    $<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:${target_upper}_STATIC_DEFINE>
+    $<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:${target_id}_STATIC_DEFINE>
     ${DEFAULT_COMPILE_DEFINITIONS}
     $<$<BOOL:${OPTION_ERRORS_AS_EXCEPTION}>:GLOBJECTS_GL_ERROR_RAISE_EXCEPTION>
 

source/version.h.in

@@ -1,15 +1,15 @@
 
-#define ${META_PROJECT_NAME_UPPER}_PROJECT_NAME        "@META_PROJECT_NAME@"
-#define ${META_PROJECT_NAME_UPPER}_PROJECT_DESCRIPTION "@META_PROJECT_DESCRIPTION@"
+#define ${META_PROJECT_ID}_PROJECT_NAME        "@META_PROJECT_NAME@"
+#define ${META_PROJECT_ID}_PROJECT_DESCRIPTION "@META_PROJECT_DESCRIPTION@"
 
-#define ${META_PROJECT_NAME_UPPER}_AUTHOR_ORGANIZATION "@META_AUTHOR_ORGANIZATION@"
-#define ${META_PROJECT_NAME_UPPER}_AUTHOR_DOMAIN       "@META_AUTHOR_DOMAIN@"
-#define ${META_PROJECT_NAME_UPPER}_AUTHOR_MAINTAINER   "@META_AUTHOR_MAINTAINER@"
+#define ${META_PROJECT_ID}_AUTHOR_ORGANIZATION "@META_AUTHOR_ORGANIZATION@"
+#define ${META_PROJECT_ID}_AUTHOR_DOMAIN       "@META_AUTHOR_DOMAIN@"
+#define ${META_PROJECT_ID}_AUTHOR_MAINTAINER   "@META_AUTHOR_MAINTAINER@"
 
-#define ${META_PROJECT_NAME_UPPER}_VERSION_MAJOR       "@META_VERSION_MAJOR@"
-#define ${META_PROJECT_NAME_UPPER}_VERSION_MINOR       "@META_VERSION_MINOR@"
-#define ${META_PROJECT_NAME_UPPER}_VERSION_PATCH       "@META_VERSION_PATCH@"
-#define ${META_PROJECT_NAME_UPPER}_VERSION_REVISION    "@META_VERSION_REVISION@"
+#define ${META_PROJECT_ID}_VERSION_MAJOR       "@META_VERSION_MAJOR@"
+#define ${META_PROJECT_ID}_VERSION_MINOR       "@META_VERSION_MINOR@"
+#define ${META_PROJECT_ID}_VERSION_PATCH       "@META_VERSION_PATCH@"
+#define ${META_PROJECT_ID}_VERSION_REVISION    "@META_VERSION_REVISION@"
 
-#define ${META_PROJECT_NAME_UPPER}_VERSION             "@META_VERSION@"
-#define ${META_PROJECT_NAME_UPPER}_NAME_VERSION        "@META_NAME_VERSION@"
+#define ${META_PROJECT_ID}_VERSION             "@META_VERSION@"
+#define ${META_PROJECT_ID}_NAME_VERSION        "@META_NAME_VERSION@"