Revision: 40927
http://brlcad.svn.sourceforge.net/brlcad/?rev=40927&view=rev
Author: starseeker
Date: 2010-10-07 03:12:11 +0000 (Thu, 07 Oct 2010)
Log Message:
-----------
Now that the Carbon header flag is on, we need the results of FindCarbon for
libdm - in the process, discovered that we need to special case framework
arguments when passed in as part of a lib list to the BRLCAD macros - they (and
only they, so far, in that they are multi-word non-list returns from a find
macro) need a space between arguments to be preserved. We're now building
successfully on Mac again, although functionality testing is not done yet.
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake
brlcad/branches/cmake/src/libdm/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2010-10-07 03:03:30 UTC (rev
40926)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-10-07 03:12:11 UTC (rev
40927)
@@ -621,6 +621,7 @@
# Find X11 if it is enabled
IF(BRLCAD-ENABLE_X11)
INCLUDE(${BRLCAD_CMAKE_DIR}/FindX11.cmake)
+ BRLCAD_INCLUDE_FILE(X11/Xlib.h HAVE_X11_XLIB_H)
ENDIF(BRLCAD-ENABLE_X11)
# Locate a curses package, and set the CONFIG_H header var if
@@ -765,7 +766,7 @@
BRLCAD_INCLUDE_FILE(ulocks.h HAVE_ULOCKS_H)
BRLCAD_INCLUDE_FILE(unistd.h HAVE_UNISTD_H)
BRLCAD_INCLUDE_FILE(winsock.h HAVE_WINSOCK_H)
-BRLCAD_INCLUDE_FILE(X11/Xlib.h HAVE_X11_XLIB_H)
+
# C++
BRLCAD_INCLUDE_FILE_CXX(limits HAVE_LIMITS)
BRLCAD_INCLUDE_FILE_CXX(istream HAVE_ISTREAM)
Modified: brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake
===================================================================
--- brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake 2010-10-07 03:03:30 UTC
(rev 40926)
+++ brlcad/branches/cmake/misc/CMake/BRLCAD_Util.cmake 2010-10-07 03:12:11 UTC
(rev 40927)
@@ -16,7 +16,8 @@
# install lists of CMake
MACRO(BRLCAD_ADDEXEC execname srcs libs)
STRING(REGEX REPLACE " " ";" srcslist "${srcs}")
- STRING(REGEX REPLACE " " ";" libslist "${libs}")
+ STRING(REGEX REPLACE " " ";" libslist1 "${libs}")
+ STRING(REGEX REPLACE "-framework;" "-framework " libslist "${libslist1}")
add_executable(${execname} ${srcslist})
target_link_libraries(${execname} ${libslist})
INSTALL(TARGETS ${execname} RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})
@@ -24,7 +25,8 @@
MACRO(BRLCAD_ADDLIB libname srcs libs)
STRING(REGEX REPLACE " " ";" srcslist "${srcs}")
- STRING(REGEX REPLACE " " ";" libslist "${libs}")
+ STRING(REGEX REPLACE " " ";" libslist1 "${libs}")
+ STRING(REGEX REPLACE "-framework;" "-framework " libslist "${libslist1}")
IF(BUILD_SHARED_LIBS)
add_library(${libname} SHARED ${srcslist})
if(NOT ${libs} MATCHES "NONE")
Modified: brlcad/branches/cmake/src/libdm/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libdm/CMakeLists.txt 2010-10-07 03:03:30 UTC
(rev 40926)
+++ brlcad/branches/cmake/src/libdm/CMakeLists.txt 2010-10-07 03:12:11 UTC
(rev 40927)
@@ -65,7 +65,7 @@
SET(DM_XLIBS "${DM_XLIBS} ${xlib}")
ENDFOREACH(xlib ${X11_LIBRARIES})
-BRLCAD_ADDLIB(libdm "${LIBDM_SRCS}" "librt libfb libged ${DM_XLIBS}
${X11_Xi_LIB} ${DM_TKLIB}")
+BRLCAD_ADDLIB(libdm "${LIBDM_SRCS}" "librt libfb libged ${DM_XLIBS}
${X11_Xi_LIB} ${DM_TKLIB} ${Carbon_LIBRARIES}")
SET_TARGET_PROPERTIES(libdm PROPERTIES VERSION 19.0.1 SOVERSION 19)
IF(BRLCAD_BUILD_LOCAL_TK AND BRLCAD-ENABLE_TK)
ADD_DEPENDENCIES(libdm tk)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
