Revision: 38939
http://brlcad.svn.sourceforge.net/brlcad/?rev=38939&view=rev
Author: davidloman
Date: 2010-05-03 11:04:47 +0000 (Mon, 03 May 2010)
Log Message:
-----------
Changed CMAKE variable 'RT_INCLUDE_DIR' to 'RT3_PUBLIC_HEADER_DIR' to remove
confusion.
Modified Paths:
--------------
rt^3/trunk/CMakeLists.txt
rt^3/trunk/cmake/rt3commons.cmake
rt^3/trunk/src/coreInterface/CMakeLists.txt
rt^3/trunk/src/other/ois/CMakeLists.txt
Modified: rt^3/trunk/CMakeLists.txt
===================================================================
--- rt^3/trunk/CMakeLists.txt 2010-05-03 10:54:06 UTC (rev 38938)
+++ rt^3/trunk/CMakeLists.txt 2010-05-03 11:04:47 UTC (rev 38939)
@@ -51,10 +51,10 @@
MESSAGE(STATUS "System Processor: ${CMAKE_SYSTEM_PROCESSOR}")
MESSAGE(STATUS "System Version: ${CMAKE_SYSTEM_VERSION}")
-SET(RT3_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include)
+SET(RT3_PUBLIC_HEADER_DIR ${CMAKE_SOURCE_DIR}/include)
#Start of global include var
-SET(GLOBAL_INCLUDE_DIRS ${RT3_INCLUDE_DIR} CACHE INTERNAL "")
+SET(GLOBAL_INCLUDE_DIRS ${RT3_PUBLIC_HEADER_DIR} CACHE INTERNAL "")
MESSAGE(STATUS "GLOBAL_INCLUDE_DIRS: ${GLOBAL_INCLUDE_DIRS}")
MESSAGE(STATUS "")
Modified: rt^3/trunk/cmake/rt3commons.cmake
===================================================================
--- rt^3/trunk/cmake/rt3commons.cmake 2010-05-03 10:54:06 UTC (rev 38938)
+++ rt^3/trunk/cmake/rt3commons.cmake 2010-05-03 11:04:47 UTC (rev 38939)
@@ -124,7 +124,7 @@
STRING (REPLACE "." "_" INCLUDE_NAME ${FILENAME_UPPER})
SET(INCLUDE_NAME "__${INCLUDE_NAME}__")
- SET(PATH_AND_NAME ${RT3_ROOT}/include/${FILENAME})
+ SET(PATH_AND_NAME ${RT3_PUBLIC_HEADER_DIR}/${FILENAME})
FILE(WRITE ${PATH_AND_NAME} ${RT3_FILE_HEADER})
FILE(APPEND ${PATH_AND_NAME} ${RT3_FILE_AUTOGEN_STATEMENT})
@@ -136,13 +136,13 @@
FOREACH (headerFile ${${NAME_UPPER}_ALL_INST_HEADERS})
FILE(APPEND ${PATH_AND_NAME} "#include \"${headerFile}\"\n")
- IF (NOT EXISTS ${RT3_ROOT}/include/${headerFile})
+ IF (NOT EXISTS ${RT3_PUBLIC_HEADER_DIR}/${headerFile})
SET(ERROR_MSG "Compiled Lib Header (${FILENAME}) points to file
/include/${headerFile}, which could not be found.")
SET (RT3_COMPILE_WARNINGS ON CACHE INTERNAL "")
SET (RT3_LAST_WARNING_MSG "Last Error: ${ERROR_MSG}" CACHE
INTERNAL "")
MESSAGE(WARNING "!! ${ERROR_MSG}")
- ENDIF (NOT EXISTS ${RT3_ROOT}/include/${headerFile})
+ ENDIF (NOT EXISTS ${RT3_PUBLIC_HEADER_DIR}/${headerFile})
ENDFOREACH (headerFile)
Modified: rt^3/trunk/src/coreInterface/CMakeLists.txt
===================================================================
--- rt^3/trunk/src/coreInterface/CMakeLists.txt 2010-05-03 10:54:06 UTC (rev
38938)
+++ rt^3/trunk/src/coreInterface/CMakeLists.txt 2010-05-03 11:04:47 UTC (rev
38939)
@@ -39,11 +39,11 @@
"#define BRLCAD_LIB_MINOR ${BRLCAD_MINOR_VERSION}\n"
"#define BRLCAD_LIB_PATCH ${BRLCAD_PATCH_VERSION}\n"
)
- FILE(WRITE ${RT3_INCLUDE_DIR}/brlcad/brlcadversion.h
${BRLCADVERSION_H_CONTENT})
+ FILE(WRITE ${RT3_PUBLIC_HEADER_DIR}/brlcad/brlcadversion.h
${BRLCADVERSION_H_CONTENT})
ENDIF(BRLCAD_VERSION)
-if(EXISTS ${RT3_INCLUDE_DIR}/brlcad/brlcadversion.h)
+if(EXISTS ${RT3_PUBLIC_HEADER_DIR}/brlcad/brlcadversion.h)
SET(PROJ_INCLUDE_DIRS
${GLOBAL_INCLUDE_DIRS}
@@ -79,6 +79,6 @@
ADD_LIBRARY (coreInterface SHARED ${LIBCOREINTERFACE_SOURCES})
MESSAGE(STATUS "\tConfiguration for '${PROJECT_NAME}'... Done.")
-ELSE(EXISTS ${RT3_INCLUDE_DIR}/brlcad/brlcadversion.h)
+ELSE(EXISTS ${RT3_PUBLIC_HEADER_DIR}/brlcad/brlcadversion.h)
MESSAGE(STATUS "\tConfiguration for '${PROJECT_NAME}'... Omitted.")
-ENDIF(EXISTS ${RT3_INCLUDE_DIR}/brlcad/brlcadversion.h)
\ No newline at end of file
+ENDIF(EXISTS ${RT3_PUBLIC_HEADER_DIR}/brlcad/brlcadversion.h)
\ No newline at end of file
Modified: rt^3/trunk/src/other/ois/CMakeLists.txt
===================================================================
--- rt^3/trunk/src/other/ois/CMakeLists.txt 2010-05-03 10:54:06 UTC (rev
38938)
+++ rt^3/trunk/src/other/ois/CMakeLists.txt 2010-05-03 11:04:47 UTC (rev
38939)
@@ -100,7 +100,7 @@
SET(OIS_INCLUDE_DIRS ${OIS_SOURCE_DIR}/includes)
-INCLUDE_DIRECTORIES (${OIS_INCLUDE_DIRS} ${RT3_INCLUDE_DIR})
+INCLUDE_DIRECTORIES (${OIS_INCLUDE_DIRS} ${RT3_PUBLIC_HEADER_DIR})
MESSAGE(STATUS "Include Directories: ${OIS_INCLUDE_DIRS}")
ADD_LIBRARY (ois SHARED ${OIS_HEADERS} ${OIS_SOURCES})
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
