[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[vidalia-svn] r2280: Use CMAKE_CXX_OUTPUT_EXTENSION to determine the extension to (vidalia/trunk)



Author: edmanm
Date: 2008-01-06 12:55:43 -0500 (Sun, 06 Jan 2008)
New Revision: 2280

Modified:
   vidalia/trunk/VidaliaMacros.cmake
Log:
Use CMAKE_CXX_OUTPUT_EXTENSION to determine the extension to use for the
windres output, instead of always assuming .o. (Microsoft's compiler seems to 
go all whiskey tango foxtrot if it sees a .o.)


Modified: vidalia/trunk/VidaliaMacros.cmake
===================================================================
--- vidalia/trunk/VidaliaMacros.cmake	2008-01-06 05:57:23 UTC (rev 2279)
+++ vidalia/trunk/VidaliaMacros.cmake	2008-01-06 17:55:43 UTC (rev 2280)
@@ -83,7 +83,9 @@
       get_filename_component(outfile ${it} NAME_WE)
       get_filename_component(rc_path ${it} PATH)
       
-      set(outfile ${CMAKE_CURRENT_BINARY_DIR}/${outfile}_res.o)
+      set(outfile
+        ${CMAKE_CURRENT_BINARY_DIR}/${outfile}_res${CMAKE_CXX_OUTPUT_EXTENSION}
+      )
       add_custom_command(OUTPUT ${outfile}
         COMMAND ${WIN32_WINDRES_EXECUTABLE}
         ARGS -i ${it} -o ${outfile} --include-dir=${rc_path}