summaryrefslogtreecommitdiffstats
path: root/Modules/Compiler
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-12-07 13:27:17 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-12-07 13:28:13 (GMT)
commitfdd09a02697af76ec316ec1b5c002d70a44543bb (patch)
treebb5759d96d50aa2cd807fc41e4fddc228dfcbdb0 /Modules/Compiler
parente6af2f3d2e754f3cda3581082658443b7f37d9ec (diff)
parent243b7c40d44df2c8b1cb0dc55e2a11b15d9e6f5d (diff)
downloadCMake-fdd09a02697af76ec316ec1b5c002d70a44543bb.zip
CMake-fdd09a02697af76ec316ec1b5c002d70a44543bb.tar.gz
CMake-fdd09a02697af76ec316ec1b5c002d70a44543bb.tar.bz2
Merge topic 'qnx_compiler_detection'
243b7c40d4 QNX: Compiler and feature detection fixes Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: MvdHurk <maikelvandenhurk@hotmail.com> Merge-request: !2699
Diffstat (limited to 'Modules/Compiler')
-rw-r--r--Modules/Compiler/QCC-C-FeatureTests.cmake1
-rw-r--r--Modules/Compiler/QCC-C.cmake3
-rw-r--r--Modules/Compiler/QCC-CXX-FeatureTests.cmake1
-rw-r--r--Modules/Compiler/QCC-CXX.cmake3
4 files changed, 8 insertions, 0 deletions
diff --git a/Modules/Compiler/QCC-C-FeatureTests.cmake b/Modules/Compiler/QCC-C-FeatureTests.cmake
new file mode 100644
index 0000000..68f4197
--- /dev/null
+++ b/Modules/Compiler/QCC-C-FeatureTests.cmake
@@ -0,0 +1 @@
+include(Compiler/GNU-C-FeatureTests)
diff --git a/Modules/Compiler/QCC-C.cmake b/Modules/Compiler/QCC-C.cmake
index ae4a2f4..6db619e 100644
--- a/Modules/Compiler/QCC-C.cmake
+++ b/Modules/Compiler/QCC-C.cmake
@@ -1,2 +1,5 @@
+# To include compiler feature detection
+include(Compiler/GNU-C)
+
include(Compiler/QCC)
__compiler_qcc(C)
diff --git a/Modules/Compiler/QCC-CXX-FeatureTests.cmake b/Modules/Compiler/QCC-CXX-FeatureTests.cmake
new file mode 100644
index 0000000..c836b94
--- /dev/null
+++ b/Modules/Compiler/QCC-CXX-FeatureTests.cmake
@@ -0,0 +1 @@
+include(Compiler/GNU-CXX-FeatureTests)
diff --git a/Modules/Compiler/QCC-CXX.cmake b/Modules/Compiler/QCC-CXX.cmake
index e86d1fa..0e7314a 100644
--- a/Modules/Compiler/QCC-CXX.cmake
+++ b/Modules/Compiler/QCC-CXX.cmake
@@ -1,3 +1,6 @@
+# To include compiler feature detection
+include(Compiler/GNU-CXX)
+
include(Compiler/QCC)
__compiler_qcc(CXX)