[Fixed #75] Support CMake 3.4+

parallaxinc · Feb 10, 2016 · 6005fc7 · 6005fc7
1 parent cf7dc03
commit 6005fc7
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 13 deletions.
diff --git a/CMakeModules/CMakeCOGCInformation.cmake b/CMakeModules/CMakeCOGCInformation.cmake
@@ -103,8 +103,12 @@ set(CMAKE_INCLUDE_FLAG_COGC ${CMAKE_INCLUDE_FLAG_C})
 set(CMAKE_COGC_ARCHIVE_CREATE ${CMAKE_C_ARCHIVE_CREATE})
 set(CMAKE_COGC_ARCHIVE_APPEND ${CMAKE_C_ARCHIVE_APPEND})
 set(CMAKE_COGC_ARCHIVE_FINISH ${CMAKE_C_ARCHIVE_FINISH})
+
+if (CMAKE_VERSION VERSION_EQUAL "3.4.0" OR CMAKE_VERSION VERSION_GREATER "3.4.0")
+    set(INCLUDES "<INCLUDES>")
+endif ()
 set(CMAKE_COGC_COMPILE_OBJECT
-"<CMAKE_C_COMPILER> <DEFINES> ${CMAKE_COGC_FLAGS_INIT} <FLAGS> -o <OBJECT> <SOURCE>"
+"<CMAKE_C_COMPILER> <DEFINES> ${CMAKE_COGC_FLAGS_INIT} <FLAGS> ${INCLUDES} -o <OBJECT> <SOURCE>"
 "${CMAKE_COMMAND} -DOBJCOPY=\"${CMAKE_OBJCOPY}\" -DFILE=<OBJECT> -P ${PROPWARE_RUN_OBJCOPY}")
 
 mark_as_advanced(

diff --git a/CMakeModules/CMakeCOGCXXInformation.cmake b/CMakeModules/CMakeCOGCXXInformation.cmake
@@ -101,8 +101,11 @@ set(CMAKE_INCLUDE_FLAG_COGCXX ${CMAKE_INCLUDE_FLAG_C})
 set(CMAKE_COGCXX_ARCHIVE_CREATE ${CMAKE_C_ARCHIVE_CREATE})
 set(CMAKE_COGCXX_ARCHIVE_APPEND ${CMAKE_C_ARCHIVE_APPEND})
 set(CMAKE_COGCXX_ARCHIVE_FINISH ${CMAKE_C_ARCHIVE_FINISH})
+if (CMAKE_VERSION VERSION_EQUAL "3.4.0" OR CMAKE_VERSION VERSION_GREATER "3.4.0")
+    set(INCLUDES "<INCLUDES>")
+endif ()
 set(CMAKE_COGCXX_COMPILE_OBJECT
- "<CMAKE_C_COMPILER> <DEFINES> ${CMAKE_COGCXX_FLAGS_INIT} <FLAGS> -o <OBJECT> <SOURCE>"
+ "<CMAKE_C_COMPILER> <DEFINES> ${CMAKE_COGCXX_FLAGS_INIT} <FLAGS> ${INCLUDES} -o <OBJECT> <SOURCE>"
  "${CMAKE_COMMAND} -DOBJCOPY=\"${CMAKE_OBJCOPY}\" -DFILE=<OBJECT> -P ${PROPWARE_RUN_OBJCOPY}")
 
 mark_as_advanced(

diff --git a/CMakeModules/CMakeECOGCInformation.cmake b/CMakeModules/CMakeECOGCInformation.cmake
@@ -101,8 +101,11 @@ set(CMAKE_INCLUDE_FLAG_ECOGC ${CMAKE_INCLUDE_FLAG_C})
 set(CMAKE_ECOGC_ARCHIVE_CREATE ${CMAKE_C_ARCHIVE_CREATE})
 set(CMAKE_ECOGC_ARCHIVE_APPEND ${CMAKE_C_ARCHIVE_APPEND})
 set(CMAKE_ECOGC_ARCHIVE_FINISH ${CMAKE_C_ARCHIVE_FINISH})
+if (CMAKE_VERSION VERSION_EQUAL "3.4.0" OR CMAKE_VERSION VERSION_GREATER "3.4.0")
+    set(INCLUDES "<INCLUDES>")
+endif ()
 set(CMAKE_ECOGC_COMPILE_OBJECT
-"<CMAKE_C_COMPILER> <DEFINES> ${CMAKE_ECOGC_FLAGS_INIT} <FLAGS> -o <OBJECT> -c <SOURCE>"
+"<CMAKE_C_COMPILER> <DEFINES> ${CMAKE_ECOGC_FLAGS_INIT} <FLAGS> ${INCLUDES} -o <OBJECT> -c <SOURCE>"
 "${CMAKE_COMMAND} -DOBJCOPY=\"${CMAKE_OBJCOPY}\" -DFILE=<OBJECT> -P ${PROPWARE_RUN_OBJCOPY}")
 
 mark_as_advanced(

diff --git a/CMakeModules/CMakeECOGCXXInformation.cmake b/CMakeModules/CMakeECOGCXXInformation.cmake
@@ -101,8 +101,11 @@ set(CMAKE_INCLUDE_FLAG_ECOGCXX ${CMAKE_INCLUDE_FLAG_C})
 set(CMAKE_ECOGCXX_ARCHIVE_CREATE ${CMAKE_C_ARCHIVE_CREATE})
 set(CMAKE_ECOGCXX_ARCHIVE_APPEND ${CMAKE_C_ARCHIVE_APPEND})
 set(CMAKE_ECOGCXX_ARCHIVE_FINISH ${CMAKE_C_ARCHIVE_FINISH})
+if (CMAKE_VERSION VERSION_EQUAL "3.4.0" OR CMAKE_VERSION VERSION_GREATER "3.4.0")
+    set(INCLUDES "<INCLUDES>")
+endif ()
 set(CMAKE_ECOGCXX_COMPILE_OBJECT
-"<CMAKE_C_COMPILER> <DEFINES> ${CMAKE_ECOGCXX_FLAGS_INIT} <FLAGS> -o <OBJECT> -c <SOURCE>"
+"<CMAKE_C_COMPILER> <DEFINES> ${CMAKE_ECOGCXX_FLAGS_INIT} <FLAGS> ${INCLUDES} -o <OBJECT> -c <SOURCE>"
  "${CMAKE_COMMAND} -DOBJCOPY=\"${CMAKE_OBJCOPY}\" -DFILE=<OBJECT> -P ${PROPWARE_RUN_OBJCOPY}")
 
 mark_as_advanced(

diff --git a/CMakeModules/FindPropWare.cmake b/CMakeModules/FindPropWare.cmake
@@ -54,10 +54,6 @@
 # SOFTWARE.
 #==============================================================================
 
-if ("${CMAKE_VERSION}" STREQUAL "3.4.0" OR "${CMAKE_VERSION}" STREQUAL "3.4.1")
-    message(FATAL_ERROR "PropWare is not compatible with CMake 3.4.0 or 3.4.1. Please downgrade to CMake 3.3.2.")
-endif ()
-
 set(CMAKE_CONFIGURATION_TYPES None
     CACHE TYPE INTERNAL FORCE)
 

diff --git a/CMakeModules/Platform/Generic-gcc-Propeller.cmake b/CMakeModules/Platform/Generic-gcc-Propeller.cmake
@@ -32,14 +32,17 @@ set(CMAKE_AR_FLAGS "cr")
 ################################################################################
 ### Compilers
 ################################################################################
+if (CMAKE_VERSION VERSION_EQUAL "3.4.0" OR CMAKE_VERSION VERSION_GREATER "3.4.0")
+    set(INCLUDES "<INCLUDES>")
+endif ()
 set(CMAKE_C_COMPILE_OBJECT
-"<CMAKE_C_COMPILER> <DEFINES> ${CMAKE_C_FLAGS_INIT} <FLAGS> -o <OBJECT> -c <SOURCE>")
+"<CMAKE_C_COMPILER> <DEFINES> ${CMAKE_C_FLAGS_INIT} <FLAGS> ${INCLUDES} -o <OBJECT> -c <SOURCE>")
 
 set(CMAKE_CXX_COMPILE_OBJECT
-"<CMAKE_CXX_COMPILER> <DEFINES> ${CMAKE_CXX_FLAGS_INIT} <FLAGS> -o <OBJECT> -c <SOURCE>")
+"<CMAKE_CXX_COMPILER> <DEFINES> ${CMAKE_CXX_FLAGS_INIT} <FLAGS> ${INCLUDES} -o <OBJECT> -c <SOURCE>")
 
 set(CMAKE_ASM_COMPILE_OBJECT
-"<CMAKE_ASM_COMPILER> <DEFINES> ${CMAKE_ASM_FLAGS_INIT} <FLAGS> -o <OBJECT> -c <SOURCE>")
+"<CMAKE_ASM_COMPILER> <DEFINES> ${CMAKE_ASM_FLAGS_INIT} <FLAGS> ${INCLUDES} -o <OBJECT> -c <SOURCE>")
 
 ################################################################################
 ### Linkers

diff --git a/DownloadCMakeBinaries.cmake b/DownloadCMakeBinaries.cmake
@@ -1,6 +1,6 @@
 set(CMAKE_MAJOR_VERSION 3)
-set(CMAKE_MINOR_VERSION 3)
-set(CMAKE_PATCH_VERSION 2)
+set(CMAKE_MINOR_VERSION 4)
+set(CMAKE_PATCH_VERSION 3)
 set(CUSTOM_LINUX_CMAKE_INSTALL_DIR pwcmake)
 set(CUSTOM_WIN32_CMAKE_INSTALL_DIR PWCMake)
 set(CUSTOM_OSX_CMAKE_INSTALL_DIR   OSXCMake)