[ros-diffs] [cwittich] 55954: [cmake] -it looks like IF(${CMAKE_SYSTEM_NAME} MATCHES "Windows") return TRUE on MacOS/Linux when cross compiling -file(TO_NATIVE_PATH) is broken as well ... next try

cwittich at svn.reactos.org cwittich at svn.reactos.org
Thu Mar 1 20:29:18 UTC 2012


Author: cwittich
Date: Thu Mar  1 20:29:18 2012
New Revision: 55954

URL: http://svn.reactos.org/svn/reactos?rev=55954&view=rev
Log:
[cmake]
-it looks like IF(${CMAKE_SYSTEM_NAME} MATCHES "Windows") return TRUE on MacOS/Linux when cross compiling
-file(TO_NATIVE_PATH) is broken as well
...
next try


Modified:
    trunk/reactos/cmake/gcc.cmake

Modified: trunk/reactos/cmake/gcc.cmake
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=55954&r1=55953&r2=55954&view=diff
==============================================================================
--- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Thu Mar  1 20:29:18 2012
@@ -20,8 +20,9 @@
 #file(TO_NATIVE_PATH ${REACTOS_SOURCE_DIR} REACTOS_SOURCE_DIR_NATIVE)
 #workaround
 set(REACTOS_SOURCE_DIR_NATIVE ${REACTOS_SOURCE_DIR})
-IF(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-STRING(REPLACE "/" "\\" REACTOS_SOURCE_DIR_NATIVE ${REACTOS_SOURCE_DIR})
+set(TEST_ENV $ENV{windir})
+if(DEFINED TEST_ENV)
+string(REPLACE "/" "\\" REACTOS_SOURCE_DIR_NATIVE ${REACTOS_SOURCE_DIR})
 endif()
 add_compile_flags("-fdebug-prefix-map=${REACTOS_SOURCE_DIR_NATIVE}=ReactOS")
 




More information about the Ros-diffs mailing list