Revision: 54124
http://brlcad.svn.sourceforge.net/brlcad/?rev=54124&view=rev
Author: caen23
Date: 2012-12-29 00:10:14 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
Avoid duplication
Modified Paths:
--------------
brlcad/trunk/src/other/togl/src/CMakeLists.txt
Modified: brlcad/trunk/src/other/togl/src/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/togl/src/CMakeLists.txt 2012-12-28 20:47:40 UTC
(rev 54123)
+++ brlcad/trunk/src/other/togl/src/CMakeLists.txt 2012-12-29 00:10:14 UTC
(rev 54124)
@@ -88,24 +88,18 @@
Xmu/LookupCmap.c
Xmu/StdCmap.c
)
- SET(TOGL_SRCS
- glew/glew.c
- ${TOGL_XMU_SRCS}
- togl.c
- toglProcAddr.c
- toglStubLib.c
- ${CMAKE_CURRENT_BINARY_DIR}/toglStubInit.c
- )
-ELSE(TOGL_WINDOWINGSYSTEM MATCHES "TOGL_X11")
- SET(TOGL_SRCS
- ${TOGL_XMU_SRCS}
- togl.c
- toglProcAddr.c
- toglStubLib.c
- ${CMAKE_CURRENT_BINARY_DIR}/toglStubInit.c
- )
+ SET(TOGL_SRCS glew/glew.c)
ENDIF(TOGL_WINDOWINGSYSTEM MATCHES "TOGL_X11")
+SET(TOGL_SRCS
+ ${TOGL_SRCS}
+ ${TOGL_XMU_SRCS}
+ togl.c
+ toglProcAddr.c
+ toglStubLib.c
+ ${CMAKE_CURRENT_BINARY_DIR}/toglStubInit.c
+ )
+
add_library(togl SHARED ${TOGL_SRCS})
ADD_DEPENDENCIES(togl togl_stubs_gen)
IF(WIN32)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. SALE $99.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122912
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
