[ros-diffs] [akhaldi] 52056: [CMAKE] * I left setting CMAKE_AR out of the condition. Fix this.

akhaldi at svn.reactos.org akhaldi at svn.reactos.org
Thu Jun 2 10:54:58 UTC 2011


Author: akhaldi
Date: Thu Jun  2 10:54:56 2011
New Revision: 52056

URL: http://svn.reactos.org/svn/reactos?rev=52056&view=rev
Log:
[CMAKE]
* I left setting CMAKE_AR out of the condition. Fix this.

Modified:
    trunk/reactos/toolchain-mingw32.cmake

Modified: trunk/reactos/toolchain-mingw32.cmake
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/toolchain-mingw32.cmake?rev=52056&r1=52055&r2=52056&view=diff
==============================================================================
--- trunk/reactos/toolchain-mingw32.cmake [iso-8859-1] (original)
+++ trunk/reactos/toolchain-mingw32.cmake [iso-8859-1] Thu Jun  2 10:54:56 2011
@@ -35,8 +35,8 @@
 set(CMAKE_ASM_COMPILER ${MINGW_PREFIX}gcc)
 set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>")
 
-set(CMAKE_AR ${MINGW_PREFIX}ar)
 if(NOT CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
+    set(CMAKE_AR ${MINGW_PREFIX}ar)
     set(CMAKE_C_CREATE_STATIC_LIBRARY "${CMAKE_AR} crs <TARGET> <LINK_FLAGS> <OBJECTS>")
     set(CMAKE_CXX_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY})
     set(CMAKE_ASM_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY})




More information about the Ros-diffs mailing list