Revision: 44763
http://brlcad.svn.sourceforge.net/brlcad/?rev=44763&view=rev
Author: starseeker
Date: 2011-06-06 21:39:42 +0000 (Mon, 06 Jun 2011)
Log Message:
-----------
More minor CMakeLists.txt changes.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2011-06-06 21:23:57 UTC (rev 44762)
+++ brlcad/trunk/CMakeLists.txt 2011-06-06 21:39:42 UTC (rev 44763)
@@ -848,13 +848,13 @@
ENDIF(APPLE)
# crypt library (needed on some platforms for enigma)
-find_library(CRYPT_LIBRARY NAMES crypt)
+FIND_LIBRARY(CRYPT_LIBRARY NAMES crypt)
MARK_AS_ADVANCED(CRYPT_LIBRARY)
# Find Java and JNI - conditionalize the include settings on
# the success of the find_package calls.
-find_package(Java)
-find_package(JNI)
+FIND_PACKAGE(Java)
+FIND_PACKAGE(JNI)
IF(JNI_FOUND AND JAVA_FOUND)
BRLCAD_INCLUDE_FILE(JavaVM/jni.h HAVE_JAVAVM_JNI_H)
BRLCAD_INCLUDE_FILE(jni.h HAVE_JNI_H)
@@ -865,13 +865,14 @@
MARK_AS_ADVANCED(BRLCAD-ENABLE_RTSERVER)
ENDIF(NOT HAVE_JNI_H AND NOT HAVE_JAVAVM_JNI_H)
-# Find X11 if it is enabled
+# Find X11 if it is enabled (we may need to extend this further
+# to sort out Mac X11 and macports X11 on some machines.)
IF(BRLCAD-ENABLE_X11)
INCLUDE(${BRLCAD_CMAKE_DIR}/FindX11.cmake)
BRLCAD_INCLUDE_FILE(X11/Xlib.h HAVE_X11_XLIB_H)
ENDIF(BRLCAD-ENABLE_X11)
-# on SunOS with Sun Studio we need sunmath
+# On SunOS with Sun Studio we need sunmath
CHECK_LIBRARY_EXISTS(sunmath ieee_flags "" HAVE_SUNMATH_LIBRARY)
IF(HAVE_SUNMATH_LIBRARY)
SET(SUN_MATH_LIB "-lsunmath")
@@ -905,15 +906,15 @@
BRLCAD_CHECK_LIBRARY(DS ds dsopen)
# OpenGL graphics
-if(BRLCAD-ENABLE_OPENGL)
+IF(BRLCAD-ENABLE_OPENGL)
INCLUDE(${BRLCAD_CMAKE_DIR}/FindGL.cmake)
- if (OPENGL_INCLUDE_DIR_GL)
+ IF(OPENGL_INCLUDE_DIR_GL)
FILE(APPEND ${CONFIG_H_FILE} "#define HAVE_GL_GL_H 1\n")
- endif (OPENGL_INCLUDE_DIR_GL)
- if (OPENGL_INCLUDE_DIR_GLX)
+ ENDIF(OPENGL_INCLUDE_DIR_GL)
+ IF(OPENGL_INCLUDE_DIR_GLX)
FILE(APPEND ${CONFIG_H_FILE} "#define HAVE_GL_GLX_H 1\n")
- endif (OPENGL_INCLUDE_DIR_GLX)
-endif (BRLCAD-ENABLE_OPENGL)
+ ENDIF(OPENGL_INCLUDE_DIR_GLX)
+ENDIF(BRLCAD-ENABLE_OPENGL)
# SGI graphics library
BRLCAD_CHECK_LIBRARY(SGIGL gl gconfig)
@@ -1157,21 +1158,21 @@
SET(MAN_DIR_LABEL "Manual pages")
SET(CONF_DIR_LABEL "Configration files")
SET(DATA_DIR_LABEL "Data resource files")
- SET(PATHLABELS CMAKE_INSTALL_PREFIX BIN_DIR MAN_DIR CONF_DIR DATA_DIR)
- SET(PATHLABELLENGTH 0)
- FOREACH(path_label ${PATHLABELS})
- STRING(LENGTH ${${path_label}_LABEL} CURRENTLENGTH)
- if (${CURRENTLENGTH} GREATER ${PATHLABELLENGTH})
- SET(PATHLABELLENGTH ${CURRENTLENGTH})
+ SET(PATH_LABELS CMAKE_INSTALL_PREFIX BIN_DIR MAN_DIR CONF_DIR DATA_DIR)
+ SET(PATH_LABEL_LENGTH 0)
+ FOREACH(path_label ${PATH_LABELS})
+ STRING(LENGTH ${${path_label}_LABEL} CURRENT_LENGTH)
+ if (${CURRENT_LENGTH} GREATER ${PATH_LABEL_LENGTH})
+ SET(PATH_LABEL_LENGTH ${CURRENT_LENGTH})
endif()
ENDFOREACH()
- FOREACH(path_label ${PATHLABELS})
+ FOREACH(path_label ${PATH_LABELS})
SET(CURRENT_LABEL ${${path_label}_LABEL})
- STRING(LENGTH ${CURRENT_LABEL} CURRENTLENGTH)
- WHILE(${PATHLABELLENGTH} GREATER ${CURRENTLENGTH})
+ STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)
+ WHILE(${PATH_LABEL_LENGTH} GREATER ${CURRENT_LENGTH})
SET(CURRENT_LABEL " ${CURRENT_LABEL}")
- STRING(LENGTH ${CURRENT_LABEL} CURRENTLENGTH)
- ENDWHILE(${PATHLABELLENGTH} GREATER ${CURRENTLENGTH})
+ STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)
+ ENDWHILE(${PATH_LABEL_LENGTH} GREATER ${CURRENT_LENGTH})
IF(path_label MATCHES "^CMAKE_INSTALL_PREFIX$")
MESSAGE("${CURRENT_LABEL}: ${${path_label}}")
ELSE(path_label MATCHES "^CMAKE_INSTALL_PREFIX$")
@@ -1199,20 +1200,20 @@
SET(CMAKE_CPPFLAGS_LABEL "CPPFLAGS")
SET(CMAKE_LDFLAGS_LABEL "LDFLAGS")
SET(SETTINGLABELS CMAKE_C_COMPILER CMAKE_CXX_COMPILER CMAKE_ALL_C_FLAGS
CMAKE_ALL_CXX_FLAGS CMAKE_CPPFLAGS CMAKE_LDFLAGS)
- SET(SETTINGLABELLENGTH 0)
+ SET(SETTING_LABEL_LENGTH 0)
FOREACH(setting_label ${SETTINGLABELS})
- STRING(LENGTH ${${setting_label}_LABEL} CURRENTLENGTH)
- if (${CURRENTLENGTH} GREATER ${SETTINGLABELLENGTH})
- SET(SETTINGLABELLENGTH ${CURRENTLENGTH})
+ STRING(LENGTH ${${setting_label}_LABEL} CURRENT_LENGTH)
+ if (${CURRENT_LENGTH} GREATER ${SETTING_LABEL_LENGTH})
+ SET(SETTING_LABEL_LENGTH ${CURRENT_LENGTH})
endif()
ENDFOREACH()
FOREACH(setting_label ${SETTINGLABELS})
SET(CURRENT_LABEL ${${setting_label}_LABEL})
- STRING(LENGTH ${CURRENT_LABEL} CURRENTLENGTH)
- WHILE(${SETTINGLABELLENGTH} GREATER ${CURRENTLENGTH})
+ STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)
+ WHILE(${SETTING_LABEL_LENGTH} GREATER ${CURRENT_LENGTH})
SET(CURRENT_LABEL "${CURRENT_LABEL} ")
- STRING(LENGTH ${CURRENT_LABEL} CURRENTLENGTH)
- ENDWHILE(${SETTINGLABELLENGTH} GREATER ${CURRENTLENGTH})
+ STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)
+ ENDWHILE(${SETTING_LABEL_LENGTH} GREATER ${CURRENT_LENGTH})
MESSAGE("${CURRENT_LABEL} = ${${setting_label}}")
ENDFOREACH()
MESSAGE("")
@@ -1275,23 +1276,23 @@
SET(SETTINGLIST2 BRLCAD-ENABLE_X11 BRLCAD-ENABLE_OPENGL
BRLCAD-ENABLE_RTSERVER BRLCAD-ENABLE_RUNTIME_DEBUG )
SET(SETTINGLIST3 BRLCAD_ARCH_BITSETTING BRLCAD-ENABLE_OPTIMIZED_BUILD
BRLCAD-ENABLE_DEBUG_BUILD BRLCAD-ENABLE_PROFILING BRLCAD-ENABLE_SMP
BUILD_STATIC_LIBS BUILD_SHARED_LIBS BRLCAD-ENABLE_COMPILER_WARNINGS
BRLCAD-ENABLE_VERBOSE_PROGRESS BRLCAD-INSTALL_EXAMPLE_GEOMETRY
BRLCAD-BUILD_DOCBUILD_MSG)
SET(ARRAYLIST SETTINGLIST1 SETTINGLIST2 SETTINGLIST3)
- SET(SETTINGLABELLENGTH 0)
+ SET(SETTING_LABEL_LENGTH 0)
FOREACH(setting_array ${ARRAYLIST})
FOREACH(setting_label ${${setting_array}})
- STRING(LENGTH ${${setting_label}_LABEL} CURRENTLENGTH)
- if (${CURRENTLENGTH} GREATER ${SETTINGLABELLENGTH})
- SET(SETTINGLABELLENGTH ${CURRENTLENGTH})
+ STRING(LENGTH ${${setting_label}_LABEL} CURRENT_LENGTH)
+ if (${CURRENT_LENGTH} GREATER ${SETTING_LABEL_LENGTH})
+ SET(SETTING_LABEL_LENGTH ${CURRENT_LENGTH})
endif()
ENDFOREACH()
ENDFOREACH()
FOREACH(setting_array ${ARRAYLIST})
FOREACH(setting_label ${${setting_array}})
SET(CURRENT_LABEL ${${setting_label}_LABEL})
- STRING(LENGTH ${CURRENT_LABEL} CURRENTLENGTH)
- WHILE(${SETTINGLABELLENGTH} GREATER ${CURRENTLENGTH})
+ STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)
+ WHILE(${SETTING_LABEL_LENGTH} GREATER ${CURRENT_LENGTH})
SET(CURRENT_LABEL "${CURRENT_LABEL}.")
- STRING(LENGTH ${CURRENT_LABEL} CURRENTLENGTH)
- ENDWHILE(${SETTINGLABELLENGTH} GREATER ${CURRENTLENGTH})
+ STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)
+ ENDWHILE(${SETTING_LABEL_LENGTH} GREATER
${CURRENT_LENGTH})
MESSAGE("${CURRENT_LABEL}..: ${${setting_label}}")
ENDFOREACH()
MESSAGE("")
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
