Revision: 41918
http://brlcad.svn.sourceforge.net/brlcad/?rev=41918&view=rev
Author: starseeker
Date: 2011-01-04 15:20:32 +0000 (Tue, 04 Jan 2011)
Log Message:
-----------
Make the liboptical/libmultispectral build match more closely the Makefile.am
build. This appears to result in the shader test passing.
Modified Paths:
--------------
brlcad/branches/cmake/src/libmultispectral/CMakeLists.txt
brlcad/branches/cmake/src/liboptical/CMakeLists.txt
Modified: brlcad/branches/cmake/src/libmultispectral/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libmultispectral/CMakeLists.txt 2011-01-04
15:17:35 UTC (rev 41917)
+++ brlcad/branches/cmake/src/libmultispectral/CMakeLists.txt 2011-01-04
15:20:32 UTC (rev 41918)
@@ -6,5 +6,5 @@
-DRT_MULTISPECTRAL
)
-BRLCAD_ADDLIB(libmultispectral "init.c sh_temp.c" "liboptical librt")
+BRLCAD_ADDLIB(libmultispectral "init.c sh_temp.c" "liboptical librt
librtms-static")
SET_TARGET_PROPERTIES(libmultispectral PROPERTIES VERSION 19.0.1 SOVERSION 19)
Modified: brlcad/branches/cmake/src/liboptical/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/liboptical/CMakeLists.txt 2011-01-04 15:17:35 UTC
(rev 41917)
+++ brlcad/branches/cmake/src/liboptical/CMakeLists.txt 2011-01-04 15:20:32 UTC
(rev 41918)
@@ -1,41 +1,41 @@
set(LIBOPTICAL_SOURCES
- init.c
- material.c
- photonmap.c
- refract.c
- sh_air.c
- sh_billboard.c
- sh_brdf.c
- sh_camo.c
- sh_cloud.c
- sh_cook.c
- sh_fbm.c
- sh_fire.c
- sh_flat.c
- sh_gauss.c
- sh_grass.c
- sh_light.c
- sh_noise.c
- sh_null.c
- sh_plastic.c
- sh_points.c
- sh_prj.c
- sh_rtrans.c
- sh_scloud.c
- sh_spm.c
- sh_stack.c
- sh_stxt.c
- sh_tcl.c
- sh_text.c
- sh_toon.c
- sh_toyota.c
- sh_treetherm.c
- sh_wood.c
- sh_xxx.c
- shade.c
- turb.c
- vers.c
- wray.c
+ init.c
+ material.c
+ photonmap.c
+ refract.c
+ sh_air.c
+ sh_billboard.c
+ sh_brdf.c
+ sh_camo.c
+ sh_cloud.c
+ sh_cook.c
+ sh_fbm.c
+ sh_fire.c
+ sh_flat.c
+ sh_gauss.c
+ sh_grass.c
+ sh_light.c
+ sh_noise.c
+ sh_null.c
+ sh_plastic.c
+ sh_points.c
+ sh_prj.c
+ sh_rtrans.c
+ sh_scloud.c
+ sh_spm.c
+ sh_stack.c
+ sh_stxt.c
+ sh_tcl.c
+ sh_text.c
+ sh_toon.c
+ sh_toyota.c
+ sh_treetherm.c
+ sh_wood.c
+ sh_xxx.c
+ shade.c
+ turb.c
+ vers.c
+ wray.c
)
include_directories(
@@ -46,3 +46,24 @@
BRLCAD_ADDLIB(liboptical "${LIBOPTICAL_SOURCES}" "librt libbn libbu")
SET_TARGET_PROPERTIES(liboptical PROPERTIES VERSION 19.0.1 SOVERSION 19)
+
+SET(LIBRTMS_SRCS
+ sh_camo.c
+ sh_light.c
+ sh_noise.c
+ sh_plastic.c
+ sh_stack.c
+ shade.c
+ )
+
+add_library(librtms-static STATIC ${LIBRTMS_SRCS})
+target_link_libraries(librtms-static librt libbn libbu)
+SET_TARGET_PROPERTIES(librtms-static PROPERTIES COMPILE_DEFINITIONS
"RT_MULTISPECTRAL")
+IF(NOT WIN32)
+ SET_TARGET_PROPERTIES(librtms-static PROPERTIES OUTPUT_NAME "librtms")
+ENDIF(NOT WIN32)
+IF(WIN32)
+ SET_TARGET_PROPERTIES(librtms-static PROPERTIES PREFIX "lib")
+ENDIF(WIN32)
+INSTALL(TARGETS librtms-static DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
