Revision: 42037
http://brlcad.svn.sourceforge.net/brlcad/?rev=42037&view=rev
Author: starseeker
Date: 2011-01-08 16:47:23 +0000 (Sat, 08 Jan 2011)
Log Message:
-----------
Gah - per target defines didn't work so hot, revert to previous approach which
special-cases src/adrt
Modified Paths:
--------------
brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake
brlcad/branches/cmake/src/adrt/CMakeLists.txt
brlcad/branches/cmake/src/libbn/CMakeLists.txt
brlcad/branches/cmake/src/libbu/CMakeLists.txt
Modified: brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake
===================================================================
--- brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake 2011-01-07 22:31:26 UTC
(rev 42036)
+++ brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake 2011-01-08 16:47:23 UTC
(rev 42037)
@@ -19,7 +19,7 @@
IF(MSVC)
STRING(REGEX REPLACE "lib" "" LOWERCORE "${libname}")
STRING(TOUPPER ${LOWERCORE} UPPER_CORE)
- SET_TARGET_PROPERTIES(${libname} PROPERTIES COMPILE_FLAGS
"-D${UPPER_CORE}_EXPORT_DLL")
+ add_definitions("-D${UPPER_CORE}_EXPORT_DLL")
ENDIF(MSVC)
ENDMACRO()
@@ -48,12 +48,12 @@
STRING(REGEX REPLACE " " ";" srcslist "${srcs}")
STRING(REGEX REPLACE " " ";" libslist1 "${libs}")
STRING(REGEX REPLACE "-framework;" "-framework " libslist "${libslist1}")
+ DLL_DEFINE(${libname})
IF(BUILD_SHARED_LIBS)
add_library(${libname} SHARED ${srcslist})
if(NOT ${libs} MATCHES "NONE")
target_link_libraries(${libname} ${libslist})
endif(NOT ${libs} MATCHES "NONE")
- DLL_DEFINE(${libname})
INSTALL(TARGETS ${libname} DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
ENDIF(BUILD_SHARED_LIBS)
IF(BUILD_STATIC_LIBS AND NOT MSVC)
@@ -70,7 +70,6 @@
#
http://www.cmake.org/Wiki/CMake_FAQ#How_do_I_make_my_shared_and_static_libraries_have_the_same_root_name.2C_but_different_suffixes.3F
SET_TARGET_PROPERTIES(${libname}-static PROPERTIES PREFIX
"lib")
ENDIF(WIN32)
- DLL_DEFINE(${libname}-static)
INSTALL(TARGETS ${libname}-static DESTINATION
${BRLCAD_INSTALL_LIB_DIR})
ENDIF(BUILD_STATIC_LIBS AND NOT MSVC)
Modified: brlcad/branches/cmake/src/adrt/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/adrt/CMakeLists.txt 2011-01-07 22:31:26 UTC
(rev 42036)
+++ brlcad/branches/cmake/src/adrt/CMakeLists.txt 2011-01-08 16:47:23 UTC
(rev 42037)
@@ -17,8 +17,28 @@
libtie/tie_kdtree0.c
libtie/tie_kdtree1.c
)
-BRLCAD_ADDLIB(libtie "${LIBTIE_SRCS}" libbu)
+IF(BUILD_SHARED_LIBS)
+ add_library(libtie SHARED ${LIBTIE_SRCS})
+ target_link_libraries(libtie libbu)
+ INSTALL(TARGETS libtie DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+ IF(WIN32)
+ SET_TARGET_PROPERTIES(libtie PROPERTIES COMPILE_FLAGS
"-DTIE_EXPORT_DLL")
+ ENDIF(WIN32)
+ENDIF(BUILD_SHARED_LIBS)
+IF(BUILD_STATIC_LIBS AND NOT MSVC)
+ add_library(libtie-static STATIC ${LIBTIE_SRCS})
+ target_link_libraries(libtie-static libbu)
+ IF(NOT WIN32)
+ SET_TARGET_PROPERTIES(libtie-static PROPERTIES OUTPUT_NAME
"libtie")
+ ENDIF(NOT WIN32)
+ IF(WIN32)
+ SET_TARGET_PROPERTIES(libtie-static PROPERTIES COMPILE_FLAGS
"-DTIE_EXPORT_DLL")
+ SET_TARGET_PROPERTIES(libtie-static PROPERTIES PREFIX "lib")
+ ENDIF(WIN32)
+ INSTALL(TARGETS libtie-static DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+ENDIF(BUILD_STATIC_LIBS AND NOT MSVC)
+
SET(LIBRENDER_SRCS
load.c
load_g.c
@@ -47,7 +67,26 @@
librender/texture_perlin.c
librender/texture_stack.c
)
-BRLCAD_ADDLIB(librender "${LIBRENDER_SRCS}" "libtie libgcv")
+IF(BUILD_SHARED_LIBS)
+ add_library(librender SHARED ${LIBRENDER_SRCS})
+ target_link_libraries(librender libtie libgcv)
+ INSTALL(TARGETS librender DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+ IF(WIN32)
+ SET_TARGET_PROPERTIES(librender PROPERTIES COMPILE_FLAGS
"-DRENDER_EXPORT_DLL")
+ ENDIF(WIN32)
+ENDIF(BUILD_SHARED_LIBS)
+IF(BUILD_STATIC_LIBS AND NOT MSVC)
+ add_library(librender-static STATIC ${LIBRENDER_SRCS})
+ target_link_libraries(librender-static libtie libgcv)
+ IF(NOT WIN32)
+ SET_TARGET_PROPERTIES(librender-static PROPERTIES OUTPUT_NAME
"librender")
+ ENDIF(NOT WIN32)
+ IF(WIN32)
+ SET_TARGET_PROPERTIES(librender-static PROPERTIES COMPILE_FLAGS
"-DRENDER_EXPORT_DLL")
+ SET_TARGET_PROPERTIES(librender-static PROPERTIES PREFIX "lib")
+ ENDIF(WIN32)
+ INSTALL(TARGETS librender-static DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
+ENDIF(BUILD_STATIC_LIBS AND NOT MSVC)
SET(tie_HDRS
adrt.h
Modified: brlcad/branches/cmake/src/libbn/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libbn/CMakeLists.txt 2011-01-07 22:31:26 UTC
(rev 42036)
+++ brlcad/branches/cmake/src/libbn/CMakeLists.txt 2011-01-08 16:47:23 UTC
(rev 42037)
@@ -34,6 +34,12 @@
wavelet.c
)
+IF(MSVC)
+ add_definitions(
+ -DBN_EXPORT_DLL
+ )
+ENDIF(MSVC)
+
BRLCAD_ADDLIB(libbn "${LIBBN_SOURCES}" libbu STRICT)
SET_TARGET_PROPERTIES(libbn PROPERTIES VERSION 19.0.1 SOVERSION 19)
Modified: brlcad/branches/cmake/src/libbu/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libbu/CMakeLists.txt 2011-01-07 22:31:26 UTC
(rev 42036)
+++ brlcad/branches/cmake/src/libbu/CMakeLists.txt 2011-01-08 16:47:23 UTC
(rev 42037)
@@ -82,6 +82,9 @@
IF(MSVC)
SET(WIN32LIBS ws2_32.lib)
+ add_definitions(
+ -DBU_EXPORT_DLL
+ )
ENDIF(MSVC)
BRLCAD_ADDLIB(libbu "${LIBBU_SOURCES}" "${CMAKE_THREAD_LIBS_INIT}
${PNG_LIBRARY} ${TCL_LIBRARY} ${WIN32LIBS}" STRICT)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
