Revision: 42033
http://brlcad.svn.sourceforge.net/brlcad/?rev=42033&view=rev
Author: starseeker
Date: 2011-01-07 22:08:37 +0000 (Fri, 07 Jan 2011)
Log Message:
-----------
Try doing the DLL_DEFINE per-target instead of for the entire directory
(untested)
Modified Paths:
--------------
brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake
brlcad/branches/cmake/src/adrt/CMakeLists.txt
Modified: brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake
===================================================================
--- brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake 2011-01-07 22:06:45 UTC
(rev 42032)
+++ brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake 2011-01-07 22:08:37 UTC
(rev 42033)
@@ -16,13 +16,11 @@
# uses a fairly standard convention - try and automate the addition of
# the definition.
MACRO(DLL_DEFINE libname)
- IF(MSVC)
- STRING(REGEX REPLACE "lib" ""
LOWERCORE "${libname}")
- STRING(TOUPPER ${LOWERCORE} UPPER_CORE)
- add_definitions(
-
"-D${UPPER_CORE}_EXPORT_DLL"
- )
- ENDIF(MSVC)
+ 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")
+ ENDIF(MSVC)
ENDMACRO()
# Core routines for adding executables and libraries to the build and
Modified: brlcad/branches/cmake/src/adrt/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/adrt/CMakeLists.txt 2011-01-07 22:06:45 UTC
(rev 42032)
+++ brlcad/branches/cmake/src/adrt/CMakeLists.txt 2011-01-07 22:08:37 UTC
(rev 42033)
@@ -17,28 +17,8 @@
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
@@ -67,26 +47,7 @@
librender/texture_perlin.c
librender/texture_stack.c
)
-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)
+BRLCAD_ADDLIB(librender "${LIBRENDER_SRCS}" "libtie libgcv")
SET(tie_HDRS
adrt.h
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
