Revision: 42036
http://brlcad.svn.sourceforge.net/brlcad/?rev=42036&view=rev
Author: starseeker
Date: 2011-01-07 22:31:26 +0000 (Fri, 07 Jan 2011)
Log Message:
-----------
Ah, right - doing it this way, targets need to be defined first.
Modified Paths:
--------------
brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake
Modified: brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake
===================================================================
--- brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake 2011-01-07 22:27:02 UTC
(rev 42035)
+++ brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake 2011-01-07 22:31:26 UTC
(rev 42036)
@@ -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,6 +70,7 @@
#
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)
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
