diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-08-10 12:54:42 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-08-10 12:54:42 (GMT) |
| commit | f9cb0f3cb44635ffaa70ae66eb5a615d90b1a861 (patch) | |
| tree | 647d8bf1c0e42782ce82068d3eacc04e97d7a5f4 | |
| parent | 78667104650e0b97edd2c26fe62672b113909e38 (diff) | |
| download | CMake-f9cb0f3cb44635ffaa70ae66eb5a615d90b1a861.zip CMake-f9cb0f3cb44635ffaa70ae66eb5a615d90b1a861.tar.gz CMake-f9cb0f3cb44635ffaa70ae66eb5a615d90b1a861.tar.bz2 | |
BUG: also include UnixPaths.cmake on these platforms, this also sets UNIX to 1
Alex
| -rw-r--r-- | Modules/Platform/AIX.cmake | 2 | ||||
| -rw-r--r-- | Modules/Platform/BSDOS.cmake | 1 | ||||
| -rw-r--r-- | Modules/Platform/BeOS.cmake | 2 | ||||
| -rw-r--r-- | Modules/Platform/MP-RAS.cmake | 1 | ||||
| -rw-r--r-- | Modules/Platform/QNX.cmake | 4 | ||||
| -rw-r--r-- | Modules/Platform/RISCos.cmake | 2 |
6 files changed, 11 insertions, 1 deletions
diff --git a/Modules/Platform/AIX.cmake b/Modules/Platform/AIX.cmake index f7d93a9..4c580fe 100644 --- a/Modules/Platform/AIX.cmake +++ b/Modules/Platform/AIX.cmake @@ -57,3 +57,5 @@ ENDIF(NOT CMAKE_COMPILER_IS_GNUCXX) # SET(CMAKE_${type}_LINK_STATIC_C_FLAGS "-bstatic") # SET(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-bdynamic") #ENDFOREACH(type) + +INCLUDE(Platform/UnixPaths) diff --git a/Modules/Platform/BSDOS.cmake b/Modules/Platform/BSDOS.cmake index 8b13789..cf9d17b 100644 --- a/Modules/Platform/BSDOS.cmake +++ b/Modules/Platform/BSDOS.cmake @@ -1 +1,2 @@ +INCLUDE(Platform/UnixPaths) diff --git a/Modules/Platform/BeOS.cmake b/Modules/Platform/BeOS.cmake index 0cbb90f..f4d84d7 100644 --- a/Modules/Platform/BeOS.cmake +++ b/Modules/Platform/BeOS.cmake @@ -10,3 +10,5 @@ SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,") + +INCLUDE(Platform/UnixPaths) diff --git a/Modules/Platform/MP-RAS.cmake b/Modules/Platform/MP-RAS.cmake index 2b2fe47..1e3e239 100644 --- a/Modules/Platform/MP-RAS.cmake +++ b/Modules/Platform/MP-RAS.cmake @@ -5,5 +5,6 @@ ELSE(CMAKE_SYSTEM MATCHES "MP-RAS-02*.") SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-Wl,-Bexport") ENDIF(CMAKE_SYSTEM MATCHES "MP-RAS-02*.") +INCLUDE(Platform/UnixPaths) diff --git a/Modules/Platform/QNX.cmake b/Modules/Platform/QNX.cmake index 5c45ef4..728b9ae 100644 --- a/Modules/Platform/QNX.cmake +++ b/Modules/Platform/QNX.cmake @@ -1,7 +1,7 @@ SET(QNXNTO 1) # GCC is the default compiler on QNX 6.3. -INCLUDE(${CMAKE_ROOT}/Modules/Platform/gcc.cmake) +INCLUDE(Platform/gcc) # The QNX GCC does not seem to have -isystem so remove the flag. SET(CMAKE_INCLUDE_SYSTEM_FLAG_C) @@ -29,3 +29,5 @@ ENDFOREACH(type) # force the language to be c++ since qnx only has gcc and not g++ and c++? SET(CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> -x c++ <FLAGS> -o <OBJECT> -c <SOURCE>") + +INCLUDE(Platform/UnixPaths) diff --git a/Modules/Platform/RISCos.cmake b/Modules/Platform/RISCos.cmake index 7d12564..3b2a092 100644 --- a/Modules/Platform/RISCos.cmake +++ b/Modules/Platform/RISCos.cmake @@ -2,3 +2,5 @@ SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-G 0") SET(CMAKE_SHARED_LIBRARY_SUFFIX "..o") SET(CMAKE_DL_LIBS "") SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-Wl,-D,08000000") + +INCLUDE(Platform/UnixPaths) |