Added support for the C(XX)_STANDARD and C(XX)_EXTENSIONS.

Also extended the tests to treat warnings (about preprocessor problems) as errors, and added two new tests about the c++ standard version.
larsch · Mar 15, 2018 · 1b591cd · 1b591cd
1 parent 6803af3
commit 1b591cd
Show file tree

Hide file tree

Showing 16 changed files with 192 additions and 66 deletions.
diff --git a/PrecompiledHeader.cmake b/PrecompiledHeader.cmake
@@ -63,7 +63,7 @@ macro(combine_arguments _variable)
   set(${_variable} "${_result}")
 endmacro()
 
-function(export_all_flags _filename)
+function(export_all_flags _filename mode)
   set(_include_directories "$<TARGET_PROPERTY:${_target},INCLUDE_DIRECTORIES>")
   set(_compile_definitions "$<TARGET_PROPERTY:${_target},COMPILE_DEFINITIONS>")
   set(_compile_flags "$<TARGET_PROPERTY:${_target},COMPILE_FLAGS>")
@@ -72,7 +72,104 @@ function(export_all_flags _filename)
   set(_compile_definitions "$<$<BOOL:${_compile_definitions}>:-D$<JOIN:${_compile_definitions},\n-D>\n>")
   set(_compile_flags "$<$<BOOL:${_compile_flags}>:$<JOIN:${_compile_flags},\n>\n>")
   set(_compile_options "$<$<BOOL:${_compile_options}>:$<JOIN:${_compile_options},\n>\n>")
-  file(GENERATE OUTPUT "${_filename}" CONTENT "${_compile_definitions}${_include_directories}${_compile_flags}${_compile_options}\n")
+
+  set(_standard_check "")
+  MESSAGE(${mode})
+  if("${mode}" STREQUAL "CXX")
+    set(_cxx_standard "$<TARGET_PROPERTY:${_target},CXX_STANDARD>")
+    set(_cxx_extensions "$<TARGET_PROPERTY:${_target},CXX_EXTENSIONS>")
+    set(_has_extensions "$<OR:$<STREQUAL:${_cxx_extensions},>,$<BOOL:${_cxx_extensions}>>") # CXX_EXTENSIONS defaults to true
+    set(_standard_check "${_standard_check}$<$<AND:$<STREQUAL:${_cxx_standard},17>,$<NOT:${_has_extensions}>>:${CMAKE_CXX17_STANDARD_COMPILE_OPTION}>")
+    set(_standard_check "${_standard_check}$<$<AND:$<STREQUAL:${_cxx_standard},14>,$<NOT:${_has_extensions}>>:${CMAKE_CXX14_STANDARD_COMPILE_OPTION}>")
+    set(_standard_check "${_standard_check}$<$<AND:$<STREQUAL:${_cxx_standard},11>,$<NOT:${_has_extensions}>>:${CMAKE_CXX11_STANDARD_COMPILE_OPTION}>")
+    set(_standard_check "${_standard_check}$<$<AND:$<STREQUAL:${_cxx_standard},98>,$<NOT:${_has_extensions}>>:${CMAKE_CXX98_STANDARD_COMPILE_OPTION}>")
+    set(_standard_check "${_standard_check}$<$<AND:$<STREQUAL:${_cxx_standard},17>,${_has_extensions}>:${CMAKE_CXX17_EXTENSION_COMPILE_OPTION}>")
+    set(_standard_check "${_standard_check}$<$<AND:$<STREQUAL:${_cxx_standard},14>,${_has_extensions}>:${CMAKE_CXX14_EXTENSION_COMPILE_OPTION}>")
+    set(_standard_check "${_standard_check}$<$<AND:$<STREQUAL:${_cxx_standard},11>,${_has_extensions}>:${CMAKE_CXX11_EXTENSION_COMPILE_OPTION}>")
+    set(_standard_check "${_standard_check}$<$<AND:$<STREQUAL:${_cxx_standard},98>,${_has_extensions}>:${CMAKE_CXX98_EXTENSION_COMPILE_OPTION}>")
+  endif()
+  if("${mode}" STREQUAL "C")
+    set(_c_standard "$<TARGET_PROPERTY:${_target},C_STANDARD>")
+    set(_c_extensions "$<TARGET_PROPERTY:${_target},C_EXTENSIONS>")
+    set(_has_extensions "$<OR:$<STREQUAL:${_c_extensions},>,$<BOOL:${_c_extensions}>>") # C_EXTENSIONS defaults to true
+    set(_standard_check "${_standard_check}$<$<AND:$<STREQUAL:${_c_standard},11>,$<NOT:${_has_extensions}>>:${CMAKE_C11_STANDARD_COMPILE_OPTION}>")
+    set(_standard_check "${_standard_check}$<$<AND:$<STREQUAL:${_c_standard},99>,$<NOT:${_has_extensions}>>:${CMAKE_C99_STANDARD_COMPILE_OPTION}>")
+    set(_standard_check "${_standard_check}$<$<AND:$<STREQUAL:${_c_standard},90>,$<NOT:${_has_extensions}>>:${CMAKE_C90_STANDARD_COMPILE_OPTION}>")
+    set(_standard_check "${_standard_check}$<$<AND:$<STREQUAL:${_c_standard},11>,${_has_extensions}>:${CMAKE_C11_EXTENSION_COMPILE_OPTION}>")
+    set(_standard_check "${_standard_check}$<$<AND:$<STREQUAL:${_c_standard},99>,${_has_extensions}>:${CMAKE_C99_EXTENSION_COMPILE_OPTION}>")
+    set(_standard_check "${_standard_check}$<$<AND:$<STREQUAL:${_c_standard},90>,${_has_extensions}>:${CMAKE_C90_EXTENSION_COMPILE_OPTION}>")
+  endif()
+
+  file(GENERATE OUTPUT "${_filename}" CONTENT "${_compile_definitions}${_include_directories}${_compile_flags}${_compile_options}${_standard_check}\n")
+endfunction()
+
+function (gcc_pch_targets_for_mode _input mode)
+    get_filename_component(_name ${_input} NAME)
+    set(_pch_header "${CMAKE_CURRENT_SOURCE_DIR}/${_input}")
+    set(_pch_binary_dir "${CMAKE_CURRENT_BINARY_DIR}/${_target}_${mode}_pch")
+    set(_pchfile "${_pch_binary_dir}/${_input}")
+    set(_output "${_pch_binary_dir}/${_name}.gch")
+
+    set(_pch_flags_file "${_pch_binary_dir}/compile_flags.rsp")
+    export_all_flags("${_pch_flags_file}" ${mode})
+    set(_compiler_FLAGS "@${_pch_flags_file}")
+    add_custom_command(
+      OUTPUT "${_pchfile}"
+      COMMAND "${CMAKE_COMMAND}" -E copy "${_pch_header}" "${_pchfile}"
+      DEPENDS "${_pch_header}"
+      COMMENT "Updating ${_name} (${mode})")
+    if("${mode}" STREQUAL "CXX")
+      add_custom_command(
+        OUTPUT "${_output}"
+        COMMAND "${CMAKE_CXX_COMPILER}" ${_compiler_FLAGS} -x c++-header -o "${_output}" "${_pchfile}"
+        DEPENDS "${_pchfile}" "${_pch_flags_file}"
+        COMMENT "Precompiling ${_name} for ${_target} (C++)")
+    endif()
+    if("${mode}" STREQUAL "C")
+      add_custom_command(
+        OUTPUT "${_output}"
+        COMMAND "${CMAKE_C_COMPILER}" ${_compiler_FLAGS_c} -x c-header -o "${_output}" "${_pchfile}"
+        DEPENDS "${_pchfile}" "${_pch_flags_file}"
+        COMMENT "Precompiling ${_name} for ${_target} (C)")
+    endif()
+
+    set(_extensions "")
+    if("${mode}" STREQUAL "CXX")
+      set(_extensions "cc|cxx|cpp")
+    endif()
+    if("${mode}" STREQUAL "C")
+      set(_extensions "c")
+    endif()
+
+    get_property(_sources TARGET ${_target} PROPERTY SOURCES)
+    foreach(_source ${_sources})
+      set(_pch_compile_flags "")
+      if(_source MATCHES \\.\(${_extensions}\)$)
+        get_source_file_property(_pch_compile_flags "${_source}" COMPILE_FLAGS)
+        if(NOT _pch_compile_flags)
+          set(_pch_compile_flags)
+        endif()
+        separate_arguments(_pch_compile_flags)
+        list(APPEND _pch_compile_flags -Winvalid-pch)
+        if(_PCH_FORCEINCLUDE)
+          list(APPEND _pch_compile_flags -include "${_pchfile}")
+        else(_PCH_FORCEINCLUDE)
+          list(APPEND _pch_compile_flags "-I${_pch_binary_dir}")
+        endif(_PCH_FORCEINCLUDE)
+
+        get_source_file_property(_object_depends "${_source}" OBJECT_DEPENDS)
+        if(NOT _object_depends)
+          set(_object_depends)
+        endif()
+        list(APPEND _object_depends "${_pchfile}")
+        list(APPEND _object_depends "${_output}")
+
+        combine_arguments(_pch_compile_flags)
+        set_source_files_properties(${_source} PROPERTIES
+          COMPILE_FLAGS "${_pch_compile_flags}"
+          OBJECT_DEPENDS "${_object_depends}")
+      endif()
+    endforeach()
 endfunction()
 
 function(add_precompiled_header _target _input)
@@ -147,68 +244,8 @@ function(add_precompiled_header _target _input)
     endif()
   endif(MSVC)
 
-  if(CMAKE_COMPILER_IS_GNUCXX)
-    get_filename_component(_name ${_input} NAME)
-    set(_pch_header "${CMAKE_CURRENT_SOURCE_DIR}/${_input}")
-    set(_pch_binary_dir "${CMAKE_CURRENT_BINARY_DIR}/${_target}_pch")
-    set(_pchfile "${_pch_binary_dir}/${_input}")
-    set(_outdir "${CMAKE_CURRENT_BINARY_DIR}/${_target}_pch/${_name}.gch")
-    file(MAKE_DIRECTORY "${_outdir}")
-    set(_output_cxx "${_outdir}/.c++")
-    set(_output_c "${_outdir}/.c")
-
-    set(_pch_flags_file "${_pch_binary_dir}/compile_flags.rsp")
-    export_all_flags("${_pch_flags_file}")
-    set(_compiler_FLAGS "@${_pch_flags_file}")
-    add_custom_command(
-      OUTPUT "${_pchfile}"
-      COMMAND "${CMAKE_COMMAND}" -E copy "${_pch_header}" "${_pchfile}"
-      DEPENDS "${_pch_header}"
-      COMMENT "Updating ${_name}")
-    add_custom_command(
-      OUTPUT "${_output_cxx}"
-      COMMAND "${CMAKE_CXX_COMPILER}" ${_compiler_FLAGS} -x c++-header -o "${_output_cxx}" "${_pchfile}"
-      DEPENDS "${_pchfile}" "${_pch_flags_file}"
-      COMMENT "Precompiling ${_name} for ${_target} (C++)")
-    add_custom_command(
-      OUTPUT "${_output_c}"
-      COMMAND "${CMAKE_C_COMPILER}" ${_compiler_FLAGS} -x c-header -o "${_output_c}" "${_pchfile}"
-      DEPENDS "${_pchfile}" "${_pch_flags_file}"
-      COMMENT "Precompiling ${_name} for ${_target} (C)")
-
-    get_property(_sources TARGET ${_target} PROPERTY SOURCES)
-    foreach(_source ${_sources})
-      set(_pch_compile_flags "")
-
-      if(_source MATCHES \\.\(cc|cxx|cpp|c\)$)
-        get_source_file_property(_pch_compile_flags "${_source}" COMPILE_FLAGS)
-        if(NOT _pch_compile_flags)
-          set(_pch_compile_flags)
-        endif()
-        separate_arguments(_pch_compile_flags)
-        list(APPEND _pch_compile_flags -Winvalid-pch)
-        if(_PCH_FORCEINCLUDE)
-          list(APPEND _pch_compile_flags -include "${_pchfile}")
-        else(_PCH_FORCEINCLUDE)
-          list(APPEND _pch_compile_flags "-I${_pch_binary_dir}")
-        endif(_PCH_FORCEINCLUDE)
-
-        get_source_file_property(_object_depends "${_source}" OBJECT_DEPENDS)
-        if(NOT _object_depends)
-          set(_object_depends)
-        endif()
-        list(APPEND _object_depends "${_pchfile}")
-        if(_source MATCHES \\.\(cc|cxx|cpp\)$)
-          list(APPEND _object_depends "${_output_cxx}")
-        else()
-          list(APPEND _object_depends "${_output_c}")
-        endif()
-
-        combine_arguments(_pch_compile_flags)
-        set_source_files_properties(${_source} PROPERTIES
-          COMPILE_FLAGS "${_pch_compile_flags}"
-          OBJECT_DEPENDS "${_object_depends}")
-      endif()
-    endforeach()
-  endif(CMAKE_COMPILER_IS_GNUCXX)
+  if(${CMAKE_CXX_COMPILER_ID} MATCHES "GNU|Clang")
+    gcc_pch_targets_for_mode("${_input}" "C")
+    gcc_pch_targets_for_mode("${_input}" "CXX")
+  endif(${CMAKE_CXX_COMPILER_ID} MATCHES "GNU|Clang")
 endfunction()
diff --git a/test/c-force/CMakeLists.txt b/test/c-force/CMakeLists.txt
@@ -7,6 +7,8 @@ if(MSVC)
   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
   set(pch_source test-pch.c)
 endif()
+set(CMAKE_CXX_FLAGS "${CMAKH_CXX_FLAGS} -Werror")
+set(CMAKE_C_FLAGS "${CMAKH_CXX_FLAGS} -Werror")
 add_executable(test-c-force test-c-force.c test-pch.h ${pch_source})
 add_precompiled_header(test-c-force test-pch.h FORCEINCLUDE)
 add_test(test-c-force test-c-force)
diff --git a/test/c/CMakeLists.txt b/test/c/CMakeLists.txt
@@ -7,6 +7,8 @@ if(MSVC)
   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
   set(pch_source test-pch.c)
 endif()
+set(CMAKE_CXX_FLAGS "${CMAKH_CXX_FLAGS} -Werror")
+set(CMAKE_C_FLAGS "${CMAKH_CXX_FLAGS} -Werror")
 add_executable(test-c test-c.c test-pch.h ${pch_source})
 add_precompiled_header(test-c test-pch.h)
 add_test(test-c test-c)
diff --git a/test/cxx-force/CMakeLists.txt b/test/cxx-force/CMakeLists.txt
@@ -7,6 +7,8 @@ if(MSVC)
   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
   set(pch_source test-pch.cpp)
 endif()
+set(CMAKE_CXX_FLAGS "${CMAKH_CXX_FLAGS} -Werror")
+set(CMAKE_C_FLAGS "${CMAKH_CXX_FLAGS} -Werror")
 add_executable(test-cxx-force test-cxx-force.cpp test-pch.h ${pch_source})
 add_precompiled_header(test-cxx-force test-pch.h FORCEINCLUDE)
 add_test(test-cxx-force test-cxx-force)
diff --git a/test/cxx/CMakeLists.txt b/test/cxx/CMakeLists.txt
@@ -7,6 +7,8 @@ if(MSVC)
   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
   set(pch_source test-pch.cpp)
 endif()
+set(CMAKE_CXX_FLAGS "${CMAKH_CXX_FLAGS} -Werror")
+set(CMAKE_C_FLAGS "${CMAKH_CXX_FLAGS} -Werror")
 add_executable(test-cxx test-cxx.cpp test-pch.h ${pch_source})
 add_precompiled_header(test-cxx test-pch.h)
 add_test(test-cxx test-cxx)
diff --git a/test/cxx11/CMakeLists.txt b/test/cxx11/CMakeLists.txt
@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 3.3)
+cmake_policy(SET CMP0058 NEW)
+enable_testing()
+project(test-cxx11)
+include(../../PrecompiledHeader.cmake)
+if(MSVC)
+  add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+  set(pch_source test-pch.cpp)
+endif()
+set(CMAKE_CXX_FLAGS "${CMAKH_CXX_FLAGS} -Werror")
+set(CMAKE_C_FLAGS "${CMAKH_CXX_FLAGS} -Werror")
+set(CMAKE_CXX_STANDARD 11)
+add_executable(test-cxx11 test-cxx.cpp test-pch.h ${pch_source})
+add_precompiled_header(test-cxx11 test-pch.h)
+add_test(test-cxx11 test-cxx11)
diff --git a/test/cxx11/test-cxx.cpp b/test/cxx11/test-cxx.cpp
@@ -0,0 +1,5 @@
+#include "test-pch.h"
+#ifndef PCH
+#error Missing precompiled header
+#endif
+int main() { return !(PCH == atoi(getenv("EXPECTED_PCH"))); }
diff --git a/test/cxx11/test-pch.cpp b/test/cxx11/test-pch.cpp
@@ -0,0 +1 @@
+#include "test-pch.h"
diff --git a/test/cxx11/test-pch.h b/test/cxx11/test-pch.h
@@ -0,0 +1,16 @@
+#define PCH 1
+#ifdef __cplusplus
+#include <cstdlib>
+#include <iostream>
+
+#if __cplusplus < 201100L
+#error This PCH has to be compiled in C++11 mode
+#endif
+
+#if __cplusplus > 201112L
+#error This PCH has to be compiled in C++11 mode
+#endif
+
+#else
+#include <stdlib.h>
+#endif
diff --git a/test/cxx14_noext/CMakeLists.txt b/test/cxx14_noext/CMakeLists.txt
@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 3.3)
+cmake_policy(SET CMP0058 NEW)
+enable_testing()
+project(test-cxx14_noext)
+include(../../PrecompiledHeader.cmake)
+if(MSVC)
+  add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+  set(pch_source test-pch.cpp)
+endif()
+set(CMAKE_CXX_FLAGS "${CMAKH_CXX_FLAGS} -Werror")
+set(CMAKE_C_FLAGS "${CMAKH_CXX_FLAGS} -Werror")
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_EXTENSIONS OFF)
+add_executable(test-cxx14_noext test-cxx.cpp test-pch.h ${pch_source})
+add_precompiled_header(test-cxx14_noext test-pch.h)
+add_test(test-cxx14_noext test-cxx14_noext)
diff --git a/test/cxx14_noext/test-cxx.cpp b/test/cxx14_noext/test-cxx.cpp
@@ -0,0 +1,5 @@
+#include "test-pch.h"
+#ifndef PCH
+#error Missing precompiled header
+#endif
+int main() { return !(PCH == atoi(getenv("EXPECTED_PCH"))); }
diff --git a/test/cxx14_noext/test-pch.cpp b/test/cxx14_noext/test-pch.cpp
@@ -0,0 +1 @@
+#include "test-pch.h"
diff --git a/test/cxx14_noext/test-pch.h b/test/cxx14_noext/test-pch.h
@@ -0,0 +1,16 @@
+#define PCH 1
+#ifdef __cplusplus
+#include <cstdlib>
+#include <iostream>
+
+#if __cplusplus < 201400L
+#error This PCH has to be compiled in C++14 mode
+#endif
+
+#if __cplusplus > 201412L
+#error This PCH has to be compiled in C++14 mode
+#endif
+
+#else
+#include <stdlib.h>
+#endif
diff --git a/test/heavy/CMakeLists.txt b/test/heavy/CMakeLists.txt
@@ -7,6 +7,8 @@ if(MSVC)
   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
   set(pch_source test-pch.cpp)
 endif()
+set(CMAKE_CXX_FLAGS "${CMAKH_CXX_FLAGS} -Werror")
+set(CMAKE_C_FLAGS "${CMAKH_CXX_FLAGS} -Werror")
 add_executable(test-heavy test-heavy.cpp test-pch.h ${pch_source})
 add_precompiled_header(test-heavy test-pch.h FORCEINCLUDE)
 add_test(test-heavy test-heavy)
diff --git a/test/mixed-force/CMakeLists.txt b/test/mixed-force/CMakeLists.txt
@@ -7,6 +7,8 @@ if(MSVC)
   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
   set(pch_source test-pch.c test-pch.cpp)
 endif()
+set(CMAKE_CXX_FLAGS "${CMAKH_CXX_FLAGS} -Werror")
+set(CMAKE_C_FLAGS "${CMAKH_CXX_FLAGS} -Werror")
 add_executable(test-mixed-force test-mixed-force.c test-mixed-force.cpp test-pch.h ${pch_source})
 add_precompiled_header(test-mixed-force test-pch.h FORCEINCLUDE)
 add_test(test-mixed-force test-mixed-force)
diff --git a/test/mixed/CMakeLists.txt b/test/mixed/CMakeLists.txt
@@ -7,6 +7,8 @@ if(MSVC)
   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
   set(pch_source test-pch.c test-pch.cpp)
 endif()
+set(CMAKE_CXX_FLAGS "${CMAKH_CXX_FLAGS} -Werror")
+set(CMAKE_C_FLAGS "${CMAKH_CXX_FLAGS} -Werror")
 add_executable(test-mixed test-mixed.c test-mixed.cpp test-pch.h ${pch_source})
 add_precompiled_header(test-mixed test-pch.h)
 add_test(test-mixed test-mixed)