Revision: 54594
http://brlcad.svn.sourceforge.net/brlcad/?rev=54594&view=rev
Author: starseeker
Date: 2013-03-08 22:39:55 +0000 (Fri, 08 Mar 2013)
Log Message:
-----------
Make the library name match the header (all except the mv, which is done
separately to avoid upsetting subversion)
Modified Paths:
--------------
brlcad/trunk/src/CMakeLists.txt
brlcad/trunk/src/conv/step/CMakeLists.txt
brlcad/trunk/src/libnurbs/CMakeLists.txt
brlcad/trunk/src/librt/CMakeLists.txt
Modified: brlcad/trunk/src/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/CMakeLists.txt 2013-03-08 22:26:54 UTC (rev 54593)
+++ brlcad/trunk/src/CMakeLists.txt 2013-03-08 22:39:55 UTC (rev 54594)
@@ -32,7 +32,7 @@
libbu
libbn
libsysv
- libnurbs
+ libbrep
librt
)
Modified: brlcad/trunk/src/conv/step/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/CMakeLists.txt 2013-03-08 22:26:54 UTC (rev
54593)
+++ brlcad/trunk/src/conv/step/CMakeLists.txt 2013-03-08 22:39:55 UTC (rev
54594)
@@ -26,7 +26,7 @@
${BRLCAD_SOURCE_DIR}/src/other/step/src/test
${CMAKE_BINARY_DIR}/src/other/step/include
${TNT_INCLUDE_DIR}
- ${BRLCAD_SOURCE_DIR}/src/libnurbs #Temporary until headers reworked
+ ${BRLCAD_SOURCE_DIR}/src/libbrep #Temporary until headers reworked
)
set(SCHEMA_FILE ${BRLCAD_SOURCE_DIR}/src/other/step/data/ap203/ap203.exp)
@@ -469,7 +469,7 @@
libwdb
librt
libbu
- libnurbs
+ libbrep
steputils
stepeditor
stepdai
Modified: brlcad/trunk/src/libnurbs/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libnurbs/CMakeLists.txt 2013-03-08 22:26:54 UTC (rev
54593)
+++ brlcad/trunk/src/libnurbs/CMakeLists.txt 2013-03-08 22:39:55 UTC (rev
54594)
@@ -1,5 +1,5 @@
-# Include directories needed by libnurbs users
-set(NURBS_INCLUDE_DIRS
+# Include directories needed by libbrep users
+set(BREP_INCLUDE_DIRS
${BRLCAD_BINARY_DIR}/include
${BRLCAD_SOURCE_DIR}/include
${BU_INCLUDE_DIRS}
@@ -9,50 +9,50 @@
)
# locally used but not needed by users of the library
-set(NURBS_LOCAL_INCLUDE_DIRS
+set(BREP_LOCAL_INCLUDE_DIRS
${CMAKE_CURRENT_SOURCE_DIR}
${REGEX_INCLUDE_DIR}
${TNT_INCLUDE_DIR}
${BRLCAD_SOURCE_DIR}/src/other/Eigen
)
-BRLCAD_LIB_INCLUDE_DIRS(nurbs NURBS_INCLUDE_DIRS NURBS_LOCAL_INCLUDE_DIRS)
+BRLCAD_LIB_INCLUDE_DIRS(brep BREP_INCLUDE_DIRS BREP_LOCAL_INCLUDE_DIRS)
-set(LIBNURBS_SOURCES
+set(LIBBREP_SOURCES
opennurbs_ext.cpp
#opennurbs_fit.cpp
PullbackCurve.cpp
)
-set(libnurbs_ignored_files
+set(libbrep_ignored_files
opennurbs_fit.h
opennurbs_fit.cpp
PullbackCurve.h
)
-CMAKEFILES(${libnurbs_ignored_files})
+CMAKEFILES(${libbrep_ignored_files})
CMAKEFILES(Makefile.am)
-# Initialize libnurbs_DEFINES in case of reconfiguration
-set(libnurbs_DEFINES "")
+# Initialize libbrep_DEFINES in case of reconfiguration
+set(libbrep_DEFINES "")
-# Set libnurbs compile definitions
-get_property(libnurbs_DEFINES GLOBAL PROPERTY libnurbs_DEFINES)
-list(APPEND libnurbs_DEFINES "OBJ_BREP=1")
+# Set libbrep compile definitions
+get_property(libbrep_DEFINES GLOBAL PROPERTY libbrep_DEFINES)
+list(APPEND libbrep_DEFINES "OBJ_BREP=1")
if(CPP_DLL_DEFINES)
- list(APPEND libnurbs_DEFINES "ON_DLL_IMPORTS")
+ list(APPEND libbrep_DEFINES "ON_DLL_IMPORTS")
endif(CPP_DLL_DEFINES)
-set_property(GLOBAL PROPERTY libnurbs_DEFINES "${libnurbs_DEFINES}")
+set_property(GLOBAL PROPERTY libbrep_DEFINES "${libbrep_DEFINES}")
-BRLCAD_ADDLIB(libnurbs "${LIBNURBS_SOURCES}"
"libbn;libbu;${OPENNURBS_LIBRARY};${ZLIB_LIBRARY};${WINSOCK_LIB};${RPCRT_LIB};${STDCXX_LIBRARIES}"
NOSTRICTCXX)
+BRLCAD_ADDLIB(libbrep "${LIBBREP_SOURCES}"
"libbn;libbu;${OPENNURBS_LIBRARY};${ZLIB_LIBRARY};${WINSOCK_LIB};${RPCRT_LIB};${STDCXX_LIBRARIES}"
NOSTRICTCXX)
if(BUILD_STATIC_LIBS)
- set_property(TARGET libnurbs-static APPEND PROPERTY COMPILE_DEFINITIONS
"OBJ_BREP=1")
+ set_property(TARGET libbrep-static APPEND PROPERTY COMPILE_DEFINITIONS
"OBJ_BREP=1")
endif(BUILD_STATIC_LIBS)
-set_target_properties(libnurbs PROPERTIES VERSION 20.0.1 SOVERSION 20)
+set_target_properties(libbrep PROPERTIES VERSION 20.0.1 SOVERSION 20)
if(CPP_DLL_DEFINES)
if(BRLCAD_BUILD_STATIC_LIBS AND BRLCAD_ENABLE_BRLCAD_LIBRARY)
- SET_PROPERTY(TARGET libnurbs-static APPEND PROPERTY COMPILE_DEFINITIONS
"ON_DLL_IMPORTS")
+ SET_PROPERTY(TARGET libbrep-static APPEND PROPERTY COMPILE_DEFINITIONS
"ON_DLL_IMPORTS")
endif(BRLCAD_BUILD_STATIC_LIBS AND BRLCAD_ENABLE_BRLCAD_LIBRARY)
endif(CPP_DLL_DEFINES)
Modified: brlcad/trunk/src/librt/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/librt/CMakeLists.txt 2013-03-08 22:26:54 UTC (rev
54593)
+++ brlcad/trunk/src/librt/CMakeLists.txt 2013-03-08 22:39:55 UTC (rev
54594)
@@ -285,7 +285,7 @@
set(LIBRT_SOURCES ${LIBRT_SOURCES} timer42.c)
endif(MSVC)
-BRLCAD_ADDLIB(librt "${LIBRT_SOURCES}"
"${LIBVDS_LIBRARY};libbn;libbu;${OPENNURBS_LIBRARY};libnurbs;${REGEX_LIBRARY};${ZLIB_LIBRARY};${WINSOCK_LIB};${RPCRT_LIB};${STDCXX_LIBRARIES}"
NOSTRICTCXX)
+BRLCAD_ADDLIB(librt "${LIBRT_SOURCES}"
"${LIBVDS_LIBRARY};libbn;libbu;${OPENNURBS_LIBRARY};libbrep;${REGEX_LIBRARY};${ZLIB_LIBRARY};${WINSOCK_LIB};${RPCRT_LIB};${STDCXX_LIBRARIES}"
NOSTRICTCXX)
if(BUILD_STATIC_LIBS)
SET_PROPERTY(TARGET librt-static APPEND PROPERTY COMPILE_DEFINITIONS
"OBJ_BREP=1")
endif(BUILD_STATIC_LIBS)
@@ -305,12 +305,12 @@
include_directories(
${CMAKE_SOURCE_DIR}/src/other/Eigen
- ${CMAKE_CURRENT_SOURCE_DIR}/../libnurbs
+ ${CMAKE_CURRENT_SOURCE_DIR}/../libbrep
)
-#BRLCAD_ADDEXEC(test_bot2nurbs test_bot2nurbs.cpp
"librt;libwdb;libnurbs;libbu" NOSTRICT NO_INSTALL)
-#BRLCAD_ADDEXEC(test_nurbsfit test_nurbsfit.cpp "librt;libwdb;libnurbs;libbu"
NOSTRICT NO_INSTALL)
-#BRLCAD_ADDEXEC(test_root3-subd test_root3-subd.cpp
"librt;libwdb;libnurbs;libbu" NOSTRICT NO_INSTALL)
+#BRLCAD_ADDEXEC(test_bot2nurbs test_bot2nurbs.cpp "librt;libwdb;libbrep;libbu"
NOSTRICT NO_INSTALL)
+#BRLCAD_ADDEXEC(test_nurbsfit test_nurbsfit.cpp "librt;libwdb;libbrep;libbu"
NOSTRICT NO_INSTALL)
+#BRLCAD_ADDEXEC(test_root3-subd test_root3-subd.cpp
"librt;libwdb;libbrep;libbu" NOSTRICT NO_INSTALL)
BRLCAD_ADDEXEC(test_dvec test_dvec.cpp "librt" NOSTRICT NO_INSTALL LOCAL)
ADD_TEST(test_dvec test_dvec)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the
endpoint security space. For insight on selecting the right partner to
tackle endpoint security challenges, access the full report.
http://p.sf.net/sfu/symantec-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
