[Cmake-commits] [cmake-commits] lowman committed FindOpenThreads.cmake 1.5 1.6 Findosg_functions.cmake 1.2 1.3

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Jan 30 16:55:59 EST 2009


Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv14786

Modified Files:
	FindOpenThreads.cmake Findosg_functions.cmake 
Log Message:
ENH: Added OSG_ROOT as supported env var (it's in the wild already).  Cleaned
up FindOpenThreads to support PATH_SUFFIXES.  Removed superfluous WIN32 registry
checks which should have been $ENV{} checks.


Index: FindOpenThreads.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindOpenThreads.cmake,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** FindOpenThreads.cmake	30 Jan 2009 20:13:07 -0000	1.5
--- FindOpenThreads.cmake	30 Jan 2009 21:55:57 -0000	1.6
***************
*** 41,63 ****
  find_path(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
      HINTS
!     $ENV{OPENTHREADS_INCLUDE_DIR}
!     $ENV{OPENTHREADS_DIR}/include
!     $ENV{OPENTHREADS_DIR}
!     $ENV{OSG_INCLUDE_DIR}
!     $ENV{OSG_DIR}/include
!     $ENV{OSG_DIR}
!     $ENV{OSGDIR}/include
!     $ENV{OSGDIR}
      PATHS
!     ~/Library/Frameworks
!     /Library/Frameworks
!     /usr/local/include
!     /usr/include
!     /sw/include # Fink
!     /opt/local/include # DarwinPorts
!     /opt/csw/include # Blastwave
!     /opt/include
!     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/include
!     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
  )
  
--- 41,59 ----
  find_path(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
      HINTS
!         # enough environment variables?
!         $ENV{OPENTHREADS_INCLUDE_DIR}
!         $ENV{OPENTHREADS_DIR}
!         $ENV{OSG_INCLUDE_DIR}
!         $ENV{OSG_DIR}
!         $ENV{OSGDIR}
!         $ENV{OpenThreads_ROOT}
!         $ENV{OSG_ROOT}
      PATHS
!         /sw # Fink
!         /opt/local # DarwinPorts
!         /opt/csw # Blastwave
!         /opt
!         /usr/freeware
!     PATH_SUFFIXES include
  )
  
***************
*** 66,97 ****
      NAMES OpenThreads OpenThreadsWin32 
      HINTS
!     $ENV{OPENTHREADS_LIBRARY_DIR}
!     $ENV{OPENTHREADS_DIR}/lib64
!     $ENV{OPENTHREADS_DIR}/lib
!     $ENV{OPENTHREADS_DIR}
!     $ENV{OSG_LIBRARY_DIR}
!     $ENV{OSG_DIR}/lib64
!     $ENV{OSG_DIR}/lib
!     $ENV{OSG_DIR}
!     $ENV{OSGDIR}/lib64
!     $ENV{OSGDIR}/lib
!     $ENV{OSGDIR}
      PATHS
!     ~/Library/Frameworks
!     /Library/Frameworks
!     /usr/local/lib64
!     /usr/local/lib
!     /usr/lib64
!     /usr/lib
!     /sw/lib64
!     /sw/lib
!     /opt/local/lib64
!     /opt/local/lib
!     /opt/csw/lib64
!     /opt/csw/lib
!     /opt/lib64
!     /opt/lib
!     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/lib
!     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
  )
  
--- 62,79 ----
      NAMES OpenThreads OpenThreadsWin32 
      HINTS
!         $ENV{OPENTHREADS_LIBRARY_DIR}
!         $ENV{OPENTHREADS_DIR}
!         $ENV{OSG_LIBRARY_DIR}
!         $ENV{OSG_DIR}
!         $ENV{OSGDIR}
!         $ENV{OpenThreads_ROOT}
!         $ENV{OSG_ROOT}
      PATHS
!         /sw
!         /opt/local
!         /opt/csw
!         /opt
!         /usr/freeware
!     PATH_SUFFIXES lib64 lib
  )
  
***************
*** 99,129 ****
      NAMES OpenThreadsd OpenThreadsWin32d
      HINTS
!     $ENV{OPENTHREADS_DEBUG_LIBRARY_DIR}
!     $ENV{OPENTHREADS_LIBRARY_DIR}
!     $ENV{OPENTHREADS_DIR}/lib64
!     $ENV{OPENTHREADS_DIR}/lib
!     $ENV{OPENTHREADS_DIR}
!     $ENV{OSG_LIBRARY_DIR}
!     $ENV{OSG_DIR}/lib64
!     $ENV{OSG_DIR}/lib
!     $ENV{OSG_DIR}
!     $ENV{OSGDIR}/lib64
!     $ENV{OSGDIR}/lib
!     $ENV{OSGDIR}
      PATHS
!     /usr/local/lib64
!     /usr/local/lib
!     /usr/lib64
!     /usr/lib
!     /sw/lib64
!     /sw/lib
!     /opt/local/lib64
!     /opt/local/lib
!     /opt/csw/lib64
!     /opt/csw/lib
!     /opt/lib64
!     /opt/lib
!     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/lib
!     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
  )
  
--- 81,99 ----
      NAMES OpenThreadsd OpenThreadsWin32d
      HINTS
!         $ENV{OPENTHREADS_DEBUG_LIBRARY_DIR}
!         $ENV{OPENTHREADS_LIBRARY_DIR}
!         $ENV{OPENTHREADS_DIR}
!         $ENV{OSG_LIBRARY_DIR}
!         $ENV{OSG_DIR}
!         $ENV{OSGDIR}
!         $ENV{OpenThreads_ROOT}
!         $ENV{OSG_ROOT}
      PATHS
!         /sw
!         /opt/local
!         /opt/csw
!         /opt
!         /usr/freeware
!     PATH_SUFFIXES lib64 lib
  )
  
***************
*** 133,137 ****
          debug ${OPENTHREADS_LIBRARY_DEBUG})
  else()
-     set(OPENTHREADS_LIBRARY_DEBUG ${OPENTHREADS_LIBRARY})
      set(OPENTHREADS_LIBRARIES ${OPENTHREADS_LIBRARY})
  endif()
--- 103,106 ----

Index: Findosg_functions.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Findosg_functions.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** Findosg_functions.cmake	30 Jan 2009 19:29:26 -0000	1.2
--- Findosg_functions.cmake	30 Jan 2009 21:55:57 -0000	1.3
***************
*** 16,29 ****
              $ENV{OSG_DIR}
              $ENV{OSGDIR}
         PATH_SUFFIXES include
         PATHS
-             ~/Library/Frameworks
-             /Library/Frameworks
              /sw # Fink
              /opt/local # DarwinPorts
              /opt/csw # Blastwave
              /opt
!             [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
!             [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
     )
  endfunction(OSG_FIND_PATH module header)
--- 16,27 ----
              $ENV{OSG_DIR}
              $ENV{OSGDIR}
+             $ENV{OSG_ROOT}
         PATH_SUFFIXES include
         PATHS
              /sw # Fink
              /opt/local # DarwinPorts
              /opt/csw # Blastwave
              /opt
!             /usr/freeware
     )
  endfunction(OSG_FIND_PATH module header)
***************
*** 42,56 ****
              $ENV{OSG_DIR}
              $ENV{OSGDIR}
         PATH_SUFFIXES lib64 lib
         PATHS
-             ~/Library/Frameworks
-             /Library/Frameworks
-             /usr/local
-             /usr
              /sw # Fink
              /opt/local # DarwinPorts
              /opt/csw # Blastwave
              /opt
!             [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
     )
  
--- 40,51 ----
              $ENV{OSG_DIR}
              $ENV{OSGDIR}
+             $ENV{OSG_ROOT}
         PATH_SUFFIXES lib64 lib
         PATHS
              /sw # Fink
              /opt/local # DarwinPorts
              /opt/csw # Blastwave
              /opt
!             /usr/freeware
     )
  
***************
*** 61,75 ****
              $ENV{OSG_DIR}
              $ENV{OSGDIR}
         PATH_SUFFIXES lib64 lib
         PATHS
-             ~/Library/Frameworks
-             /Library/Frameworks
-             /usr/local
-             /usr
              /sw # Fink
              /opt/local # DarwinPorts
              /opt/csw # Blastwave
              /opt
!             [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
      )
  
--- 56,67 ----
              $ENV{OSG_DIR}
              $ENV{OSGDIR}
+             $ENV{OSG_ROOT}
         PATH_SUFFIXES lib64 lib
         PATHS
              /sw # Fink
              /opt/local # DarwinPorts
              /opt/csw # Blastwave
              /opt
!             /usr/freeware
      )
  
***************
*** 86,91 ****
        )
     endif()
- 
- 
  endfunction(OSG_FIND_LIBRARY module library)
  
--- 78,81 ----



More information about the Cmake-commits mailing list