Skip to content
Snippets Groups Projects
Commit d3521b44 authored by Nicky's avatar Nicky
Browse files

Remove obsolete and unmaintained USE_SYSTEMLIBS

parent 07d388f4
No related branches found
No related tags found
2 merge requests!3Update to main branch,!2Rebase onto current main branch
Hide whitespace changes
Inline Side-by-side
Showing
with 135 additions and 629 deletions
indra/cmake/00-Common.cmake
+ 11
− 22
View file @ d3521b44
...@@ -139,12 +139,10 @@ if (LINUX) ...@@ -139,12 +139,10 @@ if (LINUX)
add_compile_options(-march=pentium4) add_compile_options(-march=pentium4)
endif (ADDRESS_SIZE EQUAL 32) endif (ADDRESS_SIZE EQUAL 32)
if (NOT USESYSTEMLIBS) # this stops us requiring a really recent glibc at runtime
# this stops us requiring a really recent glibc at runtime add_compile_options(-fno-stack-protector)
add_compile_options(-fno-stack-protector) # linking can be very memory-hungry, especially the final viewer link
# linking can be very memory-hungry, especially the final viewer link set(CMAKE_CXX_LINK_FLAGS "-Wl,--no-keep-memory")
set(CMAKE_CXX_LINK_FLAGS "-Wl,--no-keep-memory")
endif (NOT USESYSTEMLIBS)
set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}") set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}")
endif (LINUX) endif (LINUX)
...@@ -194,21 +192,12 @@ if (LINUX OR DARWIN) ...@@ -194,21 +192,12 @@ if (LINUX OR DARWIN)
endif (LINUX OR DARWIN) endif (LINUX OR DARWIN)
if (USESYSTEMLIBS) set(${ARCH}_linux_INCLUDES
add_definitions(-DLL_USESYSTEMLIBS=1) atk-1.0
glib-2.0
if (LINUX AND ADDRESS_SIZE EQUAL 32) gstreamer-0.10
add_compile_options(-march=pentiumpro) gtk-2.0
endif (LINUX AND ADDRESS_SIZE EQUAL 32) pango-1.0
)
else (USESYSTEMLIBS)
set(${ARCH}_linux_INCLUDES
atk-1.0
glib-2.0
gstreamer-0.10
gtk-2.0
pango-1.0
)
endif (USESYSTEMLIBS)
endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED) endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)
indra/cmake/APR.cmake
+ 35
− 39
View file @ d3521b44
...@@ -7,43 +7,39 @@ endif() ...@@ -7,43 +7,39 @@ endif()
create_target( apr::apr) create_target( apr::apr)
if (USESYSTEMLIBS) use_prebuilt_binary(apr_suite)
include(FindAPR) if (WINDOWS)
else (USESYSTEMLIBS) if (LLCOMMON_LINK_SHARED)
use_prebuilt_binary(apr_suite) set(APR_selector "lib")
if (WINDOWS) else (LLCOMMON_LINK_SHARED)
if (LLCOMMON_LINK_SHARED) set(APR_selector "")
set(APR_selector "lib") endif (LLCOMMON_LINK_SHARED)
else (LLCOMMON_LINK_SHARED) set_target_libraries( apr::apr
set(APR_selector "") ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}apr-1.lib
endif (LLCOMMON_LINK_SHARED) ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}apriconv-1.lib
set_target_libraries( apr::apr ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}aprutil-1.lib
${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}apr-1.lib )
${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}apriconv-1.lib elseif (DARWIN)
${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}aprutil-1.lib if (LLCOMMON_LINK_SHARED)
) set(APR_selector "0.dylib")
elseif (DARWIN) set(APRUTIL_selector "0.dylib")
if (LLCOMMON_LINK_SHARED) else (LLCOMMON_LINK_SHARED)
set(APR_selector "0.dylib") set(APR_selector "a")
set(APRUTIL_selector "0.dylib") set(APRUTIL_selector "a")
else (LLCOMMON_LINK_SHARED) endif (LLCOMMON_LINK_SHARED)
set(APR_selector "a")
set(APRUTIL_selector "a")
endif (LLCOMMON_LINK_SHARED)
set_target_libraries( apr::apr set_target_libraries( apr::apr
libapr-1.${APR_selector} libapr-1.${APR_selector}
libaprutil-1.${APRUTIL_selector} libaprutil-1.${APRUTIL_selector}
iconv iconv
) )
else (WINDOWS) else (WINDOWS)
set_target_libraries( apr::apr set_target_libraries( apr::apr
apr-1 apr-1
aprutil-1 aprutil-1
iconv iconv
uuid uuid
rt rt
) )
endif (WINDOWS) endif (WINDOWS)
set_target_include_dirs( apr::apr ${LIBS_PREBUILT_DIR}/include/apr-1 ) set_target_include_dirs( apr::apr ${LIBS_PREBUILT_DIR}/include/apr-1 )
endif (USESYSTEMLIBS)
indra/cmake/Audio.cmake
+ 7
− 15
View file @ d3521b44
...@@ -6,20 +6,12 @@ if(TARGET vorbis::vorbis) ...@@ -6,20 +6,12 @@ if(TARGET vorbis::vorbis)
endif() endif()
create_target(vorbis::vorbis) create_target(vorbis::vorbis)
if (USESYSTEMLIBS) use_prebuilt_binary(ogg_vorbis)
include(FindPkgConfig) set_target_include_dirs( vorbis::vorbis ${LIBS_PREBUILT_DIR}/include )
pkg_check_modules(OGG REQUIRED ogg)
pkg_check_modules(VORBIS REQUIRED vorbis)
pkg_check_modules(VORBISENC REQUIRED vorbisenc)
pkg_check_modules(VORBISFILE REQUIRED vorbisfile)
else (USESYSTEMLIBS)
use_prebuilt_binary(ogg_vorbis)
set_target_include_dirs( vorbis::vorbis ${LIBS_PREBUILT_DIR}/include )
if (WINDOWS) if (WINDOWS)
set_target_libraries(vorbis::vorbis ogg_static vorbis_static vorbisenc_static vorbisfile_static ) set_target_libraries(vorbis::vorbis ogg_static vorbis_static vorbisenc_static vorbisfile_static )
else (WINDOWS) else (WINDOWS)
set_target_libraries(vorbis::vorbis ogg vorbis vorbisenc vorbisfile ) set_target_libraries(vorbis::vorbis ogg vorbis vorbisenc vorbisfile )
endif (WINDOWS) endif (WINDOWS)
endif (USESYSTEMLIBS)
indra/cmake/Boost.cmake
+ 36
− 49
View file @ d3521b44
...@@ -9,55 +9,42 @@ create_target( boost::boost ) ...@@ -9,55 +9,42 @@ create_target( boost::boost )
set(Boost_FIND_QUIETLY ON) set(Boost_FIND_QUIETLY ON)
set(Boost_FIND_REQUIRED ON) set(Boost_FIND_REQUIRED ON)
if (USESYSTEMLIBS) use_prebuilt_binary(boost)
include(FindBoost) set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
set(BOOST_CONTEXT_LIBRARY boost_context-mt) # As of sometime between Boost 1.67 and 1.72, Boost libraries are suffixed
set(BOOST_FIBER_LIBRARY boost_fiber-mt) # with the address size.
set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt) set(addrsfx "-x${ADDRESS_SIZE}")
set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
set(BOOST_REGEX_LIBRARY boost_regex-mt) if (WINDOWS)
set(BOOST_SIGNALS_LIBRARY boost_signals-mt) set_target_libraries( boost::boost
set(BOOST_SYSTEM_LIBRARY boost_system-mt) libboost_context-mt${addrsfx}
set(BOOST_THREAD_LIBRARY boost_thread-mt) libboost_fiber-mt${addrsfx}
else (USESYSTEMLIBS) libboost_filesystem-mt${addrsfx}
use_prebuilt_binary(boost) libboost_program_options-mt${addrsfx}
set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) libboost_regex-mt${addrsfx}
libboost_system-mt${addrsfx}
# As of sometime between Boost 1.67 and 1.72, Boost libraries are suffixed libboost_thread-mt${addrsfx})
# with the address size. elseif (LINUX)
set(addrsfx "-x${ADDRESS_SIZE}") set_target_libraries( boost::boost
boost_context-mt${addrsfx}
if (WINDOWS) boost_fiber-mt${addrsfx}
set_target_libraries( boost::boost boost_filesystem-mt${addrsfx}
libboost_context-mt${addrsfx} boost_program_options-mt${addrsfx}
libboost_fiber-mt${addrsfx} boost_regex-mt${addrsfx}
libboost_filesystem-mt${addrsfx} boost_signals-mt${addrsfx}
libboost_program_options-mt${addrsfx} boost_system-mt${addrsfx}
libboost_regex-mt${addrsfx} boost_thread-mt${addrsfx})
libboost_system-mt${addrsfx} elseif (DARWIN)
libboost_thread-mt${addrsfx}) set_target_libraries( boost::boost
elseif (LINUX) boost_context-mt${addrsfx}
set_target_libraries( boost::boost boost_fiber-mt${addrsfx}
boost_context-mt${addrsfx} boost_filesystem-mt${addrsfx}
boost_fiber-mt${addrsfx} boost_program_options-mt${addrsfx}
boost_filesystem-mt${addrsfx} boost_regex-mt${addrsfx}
boost_program_options-mt${addrsfx} boost_system-mt${addrsfx}
boost_regex-mt${addrsfx} boost_thread-mt${addrsfx})
boost_signals-mt${addrsfx} endif (WINDOWS)
boost_system-mt${addrsfx}
boost_thread-mt${addrsfx})
elseif (DARWIN)
set_target_libraries( boost::boost
boost_context-mt${addrsfx}
boost_fiber-mt${addrsfx}
boost_filesystem-mt${addrsfx}
boost_program_options-mt${addrsfx}
boost_regex-mt${addrsfx}
boost_system-mt${addrsfx}
boost_thread-mt${addrsfx})
endif (WINDOWS)
endif (USESYSTEMLIBS)
if (LINUX) if (LINUX)
set(BOOST_SYSTEM_LIBRARY ${BOOST_SYSTEM_LIBRARY} rt) set(BOOST_SYSTEM_LIBRARY ${BOOST_SYSTEM_LIBRARY} rt)
......
indra/cmake/CEFPlugin.cmake
+ 2
− 7
View file @ d3521b44
...@@ -7,13 +7,8 @@ if(TARGET cef::cef) ...@@ -7,13 +7,8 @@ if(TARGET cef::cef)
endif() endif()
create_target( cef::cef ) create_target( cef::cef )
if (USESYSTEMLIBS) use_prebuilt_binary(dullahan)
set(CEFPLUGIN OFF CACHE BOOL set_target_include_dirs( cef::cef ${LIBS_PREBUILT_DIR}/include/cef)
"CEFPLUGIN support for the llplugin/llmedia test apps.")
else (USESYSTEMLIBS)
use_prebuilt_binary(dullahan)
set_target_include_dirs( cef::cef ${LIBS_PREBUILT_DIR}/include/cef)
endif (USESYSTEMLIBS)
if (WINDOWS) if (WINDOWS)
set_target_libraries( cef::cef set_target_libraries( cef::cef
......
indra/cmake/CMakeLists.txt
+ 2
− 12
View file @ d3521b44
...@@ -23,18 +23,8 @@ set(cmake_SOURCE_FILES ...@@ -23,18 +23,8 @@ set(cmake_SOURCE_FILES
DeploySharedLibs.cmake DeploySharedLibs.cmake
DragDrop.cmake DragDrop.cmake
EXPAT.cmake EXPAT.cmake
FindAPR.cmake FindAutobuild.cmake
FindAutobuild.cmake FMODSTUDIO.cmake
FindGLH.cmake
FindHUNSPELL.cmake
FindJsonCpp.cmake
FindNDOF.cmake
FindOpenJPEG.cmake
FindSCP.cmake
FindURIPARSER.cmake
FindXmlRpcEpi.cmake
FindZLIBNG.cmake
FMODSTUDIO.cmake
FreeType.cmake FreeType.cmake
GLEXT.cmake GLEXT.cmake
GLH.cmake GLH.cmake
......
indra/cmake/CURL.cmake
+ 7
− 11
View file @ d3521b44
...@@ -6,14 +6,10 @@ if( TARGET libcurl::libcurl ) ...@@ -6,14 +6,10 @@ if( TARGET libcurl::libcurl )
endif() endif()
create_target(libcurl::libcurl) create_target(libcurl::libcurl)
if (USESYSTEMLIBS) use_prebuilt_binary(curl)
include(FindCURL) if (WINDOWS)
else (USESYSTEMLIBS) set_target_libraries(libcurl::libcurl libcurl.lib)
use_prebuilt_binary(curl) else (WINDOWS)
if (WINDOWS) set_target_libraries(libcurl::libcurl libcurl.a)
set_target_libraries(libcurl::libcurl libcurl.lib) endif (WINDOWS)
else (WINDOWS) set_target_include_dirs( libcurl::libcurl ${LIBS_PREBUILT_DIR}/include)
set_target_libraries(libcurl::libcurl libcurl.a)
endif (WINDOWS)
set_target_include_dirs( libcurl::libcurl ${LIBS_PREBUILT_DIR}/include)
endif (USESYSTEMLIBS)
indra/cmake/Copy3rdPartyLibs.cmake
+ 4
− 6
View file @ d3521b44
...@@ -280,9 +280,7 @@ to_staging_dirs( ...@@ -280,9 +280,7 @@ to_staging_dirs(
${release_files} ${release_files}
) )
if(NOT USESYSTEMLIBS) add_custom_target(
add_custom_target( stage_third_party_libs ALL
stage_third_party_libs ALL DEPENDS ${third_party_targets}
DEPENDS ${third_party_targets} )
)
endif(NOT USESYSTEMLIBS)
indra/cmake/DBusGlib.cmake
+ 11
− 18
View file @ d3521b44
# -*- cmake -*- # -*- cmake -*-
include(Prebuilt) include(Prebuilt)
if (USESYSTEMLIBS) use_prebuilt_binary(dbus_glib)
include(FindPkgConfig) set(DBUSGLIB_FOUND ON FORCE BOOL)
set(DBUSGLIB_INCLUDE_DIRS
pkg_check_modules(DBUSGLIB REQUIRED dbus-glib-1) ${LIBS_PREBUILT_DIR}/include/dbus
)
elseif (LINUX) # We don't need to explicitly link against dbus-glib itself, because
use_prebuilt_binary(dbus_glib) # the viewer probes for the system's copy at runtime.
set(DBUSGLIB_FOUND ON FORCE BOOL) set(DBUSGLIB_LIBRARIES
set(DBUSGLIB_INCLUDE_DIRS gobject-2.0
${LIBS_PREBUILT_DIR}/include/dbus glib-2.0
) )
# We don't need to explicitly link against dbus-glib itself, because
# the viewer probes for the system's copy at runtime.
set(DBUSGLIB_LIBRARIES
gobject-2.0
glib-2.0
)
endif (USESYSTEMLIBS)
if (DBUSGLIB_FOUND) if (DBUSGLIB_FOUND)
set(DBUSGLIB ON CACHE BOOL "Build with dbus-glib message bus support.") set(DBUSGLIB ON CACHE BOOL "Build with dbus-glib message bus support.")
......
indra/cmake/DragDrop.cmake
+ 6
− 10
View file @ d3521b44
# -*- cmake -*- # -*- cmake -*-
set(OS_DRAG_DROP ON CACHE BOOL "Build the viewer with OS level drag and drop turned on or off") set(OS_DRAG_DROP ON CACHE BOOL "Build the viewer with OS level drag and drop turned on or off")
if (OS_DRAG_DROP)
if (OS_DRAG_DROP)
if (WINDOWS) if (WINDOWS)
add_definitions(-DLL_OS_DRAGDROP_ENABLED=1) add_definitions(-DLL_OS_DRAGDROP_ENABLED=1)
endif (WINDOWS) endif (WINDOWS)
if (DARWIN) if (DARWIN)
add_definitions(-DLL_OS_DRAGDROP_ENABLED=1) add_definitions(-DLL_OS_DRAGDROP_ENABLED=1)
endif (DARWIN) endif (DARWIN)
if (LINUX) if (LINUX)
add_definitions(-DLL_OS_DRAGDROP_ENABLED=0) add_definitions(-DLL_OS_DRAGDROP_ENABLED=0)
endif (LINUX) endif (LINUX)
endif (OS_DRAG_DROP)
endif (OS_DRAG_DROP)
indra/cmake/EXPAT.cmake
+ 13
− 17
View file @ d3521b44
...@@ -6,20 +6,16 @@ if( TARGET expat::expat ) ...@@ -6,20 +6,16 @@ if( TARGET expat::expat )
endif() endif()
create_target( expat::expat INTERFACE IMPORTED ) create_target( expat::expat INTERFACE IMPORTED )
if (USESYSTEMLIBS) use_prebuilt_binary(expat)
include(FindEXPAT) if (WINDOWS)
else (USESYSTEMLIBS) set_target_libraries( expat::expat libexpatMT )
use_prebuilt_binary(expat) set(EXPAT_COPY libexpatMT.dll)
if (WINDOWS) else (WINDOWS)
set_target_libraries( expat::expat libexpatMT ) set_target_libraries( expat::expat expat )
set(EXPAT_COPY libexpatMT.dll) if (DARWIN)
else (WINDOWS) set(EXPAT_COPY libexpat.1.dylib libexpat.dylib)
set_target_libraries( expat::expat expat ) else ()
if (DARWIN) set(EXPAT_COPY libexpat.so.1 libexpat.so)
set(EXPAT_COPY libexpat.1.dylib libexpat.dylib) endif ()
else () endif (WINDOWS)
set(EXPAT_COPY libexpat.so.1 libexpat.so) set_target_include_dirs( expat::expat ${LIBS_PREBUILT_DIR}/include )
endif ()
endif (WINDOWS)
set_target_include_dirs( expat::expat ${LIBS_PREBUILT_DIR}/include )
endif (USESYSTEMLIBS)
indra/cmake/ExamplePlugin.cmake
+ 1
− 6
View file @ d3521b44
...@@ -2,13 +2,8 @@ ...@@ -2,13 +2,8 @@
include(Linking) include(Linking)
include(Prebuilt) include(Prebuilt)
if (USESYSTEMLIBS) set(EXAMPLEPLUGIN ON CACHE BOOL
set(EXAMPLEPLUGIN OFF CACHE BOOL
"EXAMPLEPLUGIN support for the llplugin/llmedia test apps.") "EXAMPLEPLUGIN support for the llplugin/llmedia test apps.")
else (USESYSTEMLIBS)
set(EXAMPLEPLUGIN ON CACHE BOOL
"EXAMPLEPLUGIN support for the llplugin/llmedia test apps.")
endif (USESYSTEMLIBS)
if (WINDOWS) if (WINDOWS)
elseif (DARWIN) elseif (DARWIN)
......
indra/cmake/FindAPR.cmake deleted 100644 → 0
+ 0
− 94
View file @ 07d388f4
# -*- cmake -*-
# - Find Apache Portable Runtime
# Find the APR includes and libraries
# This module defines
# APR_INCLUDE_DIR and APRUTIL_INCLUDE_DIR, where to find apr.h, etc.
# APR_LIBRARIES and APRUTIL_LIBRARIES, the libraries needed to use APR.
# APR_FOUND and APRUTIL_FOUND, If false, do not try to use APR.
# also defined, but not for general use are
# APR_LIBRARY and APRUTIL_LIBRARY, where to find the APR library.
# APR first.
FIND_PATH(APR_INCLUDE_DIR apr.h
/usr/local/include/apr-1
/usr/local/include/apr-1.0
/usr/include/apr-1
/usr/include/apr-1.0
)
SET(APR_NAMES ${APR_NAMES} apr-1)
FIND_LIBRARY(APR_LIBRARY
NAMES ${APR_NAMES}
PATHS /usr/lib /usr/local/lib
)
IF (APR_LIBRARY AND APR_INCLUDE_DIR)
SET(APR_LIBRARIES ${APR_LIBRARY})
SET(APR_FOUND "YES")
ELSE (APR_LIBRARY AND APR_INCLUDE_DIR)
SET(APR_FOUND "NO")
ENDIF (APR_LIBRARY AND APR_INCLUDE_DIR)
IF (APR_FOUND)
IF (NOT APR_FIND_QUIETLY)
MESSAGE(STATUS "Found APR: ${APR_LIBRARIES}")
ENDIF (NOT APR_FIND_QUIETLY)
ELSE (APR_FOUND)
IF (APR_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find APR library")
ENDIF (APR_FIND_REQUIRED)
ENDIF (APR_FOUND)
# Deprecated declarations.
SET (NATIVE_APR_INCLUDE_PATH ${APR_INCLUDE_DIR} )
GET_FILENAME_COMPONENT (NATIVE_APR_LIB_PATH ${APR_LIBRARY} PATH)
MARK_AS_ADVANCED(
APR_LIBRARY
APR_INCLUDE_DIR
)
# Next, APRUTIL.
FIND_PATH(APRUTIL_INCLUDE_DIR apu.h
/usr/local/include/apr-1
/usr/local/include/apr-1.0
/usr/include/apr-1
/usr/include/apr-1.0
)
SET(APRUTIL_NAMES ${APRUTIL_NAMES} aprutil-1)
FIND_LIBRARY(APRUTIL_LIBRARY
NAMES ${APRUTIL_NAMES}
PATHS /usr/lib /usr/local/lib
)
IF (APRUTIL_LIBRARY AND APRUTIL_INCLUDE_DIR)
SET(APRUTIL_LIBRARIES ${APRUTIL_LIBRARY})
SET(APRUTIL_FOUND "YES")
ELSE (APRUTIL_LIBRARY AND APRUTIL_INCLUDE_DIR)
SET(APRUTIL_FOUND "NO")
ENDIF (APRUTIL_LIBRARY AND APRUTIL_INCLUDE_DIR)
IF (APRUTIL_FOUND)
IF (NOT APRUTIL_FIND_QUIETLY)
MESSAGE(STATUS "Found APRUTIL: ${APRUTIL_LIBRARIES}")
ENDIF (NOT APRUTIL_FIND_QUIETLY)
ELSE (APRUTIL_FOUND)
IF (APRUTIL_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find APRUTIL library")
ENDIF (APRUTIL_FIND_REQUIRED)
ENDIF (APRUTIL_FOUND)
# Deprecated declarations.
SET (NATIVE_APRUTIL_INCLUDE_PATH ${APRUTIL_INCLUDE_DIR} )
GET_FILENAME_COMPONENT (NATIVE_APRUTIL_LIB_PATH ${APRUTIL_LIBRARY} PATH)
MARK_AS_ADVANCED(
APRUTIL_LIBRARY
APRUTIL_INCLUDE_DIR
)
indra/cmake/FindGLH.cmake deleted 100644 → 0
+ 0
− 30
View file @ 07d388f4
# -*- cmake -*-
# - Find GLH
# Find the Graphic Library Helper includes.
# This module defines
# GLH_INCLUDE_DIR, where to find glh/glh_linear.h.
# GLH_FOUND, If false, do not try to use GLH.
find_path(GLH_INCLUDE_DIR glh/glh_linear.h
NO_SYSTEM_ENVIRONMENT_PATH
)
if (GLH_INCLUDE_DIR)
set(GLH_FOUND "YES")
else (GLH_INCLUDE_DIR)
set(GLH_FOUND "NO")
endif (GLH_INCLUDE_DIR)
if (GLH_FOUND)
if (NOT GLH_FIND_QUIETLY)
message(STATUS "Found GLH: ${GLH_INCLUDE_DIR}")
set(GLH_FIND_QUIETLY TRUE) # Only alert us the first time
endif (NOT GLH_FIND_QUIETLY)
else (GLH_FOUND)
if (GLH_FIND_REQUIRED)
message(FATAL_ERROR "Could not find GLH")
endif (GLH_FIND_REQUIRED)
endif (GLH_FOUND)
mark_as_advanced(GLH_INCLUDE_DIR)
indra/cmake/FindGooglePerfTools.cmake deleted 100644 → 0
+ 0
− 66
View file @ 07d388f4
# -*- cmake -*-
# - Find Google perftools
# Find the Google perftools includes and libraries
# This module defines
# GOOGLE_PERFTOOLS_INCLUDE_DIR, where to find heap-profiler.h, etc.
# GOOGLE_PERFTOOLS_FOUND, If false, do not try to use Google perftools.
# also defined for general use are
# TCMALLOC_LIBRARIES, where to find the tcmalloc library.
# STACKTRACE_LIBRARIES, where to find the stacktrace library.
# PROFILER_LIBRARIES, where to find the profiler library.
FIND_PATH(GOOGLE_PERFTOOLS_INCLUDE_DIR google/heap-profiler.h
/usr/local/include
/usr/include
)
SET(TCMALLOC_NAMES ${TCMALLOC_NAMES} tcmalloc)
FIND_LIBRARY(TCMALLOC_LIBRARY
NAMES ${TCMALLOC_NAMES}
PATHS /usr/lib /usr/local/lib
)
IF (TCMALLOC_LIBRARY AND GOOGLE_PERFTOOLS_INCLUDE_DIR)
SET(TCMALLOC_LIBRARIES ${TCMALLOC_LIBRARY})
SET(GOOGLE_PERFTOOLS_FOUND "YES")
ELSE (TCMALLOC_LIBRARY AND GOOGLE_PERFTOOLS_INCLUDE_DIR)
SET(GOOGLE_PERFTOOLS_FOUND "NO")
ENDIF (TCMALLOC_LIBRARY AND GOOGLE_PERFTOOLS_INCLUDE_DIR)
SET(STACKTRACE_NAMES ${STACKTRACE_NAMES} stacktrace)
FIND_LIBRARY(STACKTRACE_LIBRARY
NAMES ${STACKTRACE_LIBRARY}
PATHS /usr/lib /usr/local/lib
)
IF (STACKTRACE_LIBRARY AND GOOGLE_PERFTOOLS_INCLUDE_DIR)
SET(STACKTRACE_LIBRARIES ${STACKTRACE_LIBRARY})
ENDIF (STACKTRACE_LIBRARY AND GOOGLE_PERFTOOLS_INCLUDE_DIR)
SET(PROFILER_NAMES ${PROFILER_NAMES} profiler)
FIND_LIBRARY(PROFILER_LIBRARY
NAMES ${PROFILER_LIBRARY}
PATHS /usr/lib /usr/local/lib
)
IF (PROFILER_LIBRARY AND GOOGLE_PERFTOOLS_INCLUDE_DIR)
SET(PROFILER_LIBRARIES ${PROFILER_LIBRARY})
ENDIF (PROFILER_LIBRARY AND GOOGLE_PERFTOOLS_INCLUDE_DIR)
IF (GOOGLE_PERFTOOLS_FOUND)
IF (NOT GOOGLE_PERFTOOLS_FIND_QUIETLY)
MESSAGE(STATUS "Found Google perftools: ${GOOGLE_PERFTOOLS_LIBRARIES}")
ENDIF (NOT GOOGLE_PERFTOOLS_FIND_QUIETLY)
ELSE (GOOGLE_PERFTOOLS_FOUND)
IF (GOOGLE_PERFTOOLS_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find Google perftools library")
ENDIF (GOOGLE_PERFTOOLS_FIND_REQUIRED)
ENDIF (GOOGLE_PERFTOOLS_FOUND)
MARK_AS_ADVANCED(
TCMALLOC_LIBRARY
STACKTRACE_LIBRARY
PROFILER_LIBRARY
GOOGLE_PERFTOOLS_INCLUDE_DIR
)
indra/cmake/FindHUNSPELL.cmake deleted 100644 → 0
+ 0
− 38
View file @ 07d388f4
# -*- cmake -*-
# - Find HUNSPELL
# This module defines
# HUNSPELL_INCLUDE_DIR, where to find libhunspell.h, etc.
# HUNSPELL_LIBRARY, the library needed to use HUNSPELL.
# HUNSPELL_FOUND, If false, do not try to use HUNSPELL.
find_path(HUNSPELL_INCLUDE_DIR hunspell.h
PATH_SUFFIXES hunspell
)
set(HUNSPELL_NAMES ${HUNSPELL_NAMES} libhunspell-1.3 libhunspell)
find_library(HUNSPELL_LIBRARY
NAMES ${HUNSPELL_NAMES}
)
if (HUNSPELL_LIBRARY AND HUNSPELL_INCLUDE_DIR)
set(HUNSPELL_FOUND "YES")
else (HUNSPELL_LIBRARY AND HUNSPELL_INCLUDE_DIR)
set(HUNSPELL_FOUND "NO")
endif (HUNSPELL_LIBRARY AND HUNSPELL_INCLUDE_DIR)
if (HUNSPELL_FOUND)
if (NOT HUNSPELL_FIND_QUIETLY)
message(STATUS "Found Hunspell: Library in '${HUNSPELL_LIBRARY}' and header in '${HUNSPELL_INCLUDE_DIR}' ")
endif (NOT HUNSPELL_FIND_QUIETLY)
else (HUNSPELL_FOUND)
if (HUNSPELL_FIND_REQUIRED)
message(FATAL_ERROR " * * *\nCould not find HUNSPELL library! * * *")
endif (HUNSPELL_FIND_REQUIRED)
endif (HUNSPELL_FOUND)
mark_as_advanced(
HUNSPELL_LIBRARY
HUNSPELL_INCLUDE_DIR
)
indra/cmake/FindJsonCpp.cmake deleted 100644 → 0
+ 0
− 60
View file @ 07d388f4
# -*- cmake -*-
# - Find JSONCpp
# Find the JSONCpp includes and library
# This module defines
# JSONCPP_INCLUDE_DIR, where to find json.h, etc.
# JSONCPP_LIBRARIES, the libraries needed to use jsoncpp.
# JSONCPP_FOUND, If false, do not try to use jsoncpp.
# also defined, but not for general use are
# JSONCPP_LIBRARY, where to find the jsoncpp library.
FIND_PATH(JSONCPP_INCLUDE_DIR jsoncpp/json.h
/usr/local/include
/usr/include
)
# Get the GCC compiler version
EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
OUTPUT_VARIABLE _gcc_COMPILER_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
)
# Try to find a library that was compiled with the same compiler version as we currently use.
SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson_linux-gcc-${_gcc_COMPILER_VERSION}_libmt.so)
IF (USESYSTEMLIBS)
# On standalone, assume that the system installed library was compiled with the used compiler.
SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson.so)
ENDIF (USESYSTEMLIBS)
FIND_LIBRARY(JSONCPP_LIBRARY
NAMES ${JSONCPP_NAMES}
PATHS /usr/lib /usr/local/lib
)
IF (JSONCPP_LIBRARY AND JSONCPP_INCLUDE_DIR)
SET(JSONCPP_LIBRARIES ${JSONCPP_LIBRARY})
SET(JSONCPP_FOUND "YES")
ELSE (JSONCPP_LIBRARY AND JSONCPP_INCLUDE_DIR)
SET(JSONCPP_FOUND "NO")
ENDIF (JSONCPP_LIBRARY AND JSONCPP_INCLUDE_DIR)
IF (JSONCPP_FOUND)
IF (NOT JSONCPP_FIND_QUIETLY)
MESSAGE(STATUS "Found JSONCpp: ${JSONCPP_LIBRARIES}")
ENDIF (NOT JSONCPP_FIND_QUIETLY)
ELSE (JSONCPP_FOUND)
IF (JSONCPP_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find JSONCpp library")
ENDIF (JSONCPP_FIND_REQUIRED)
ENDIF (JSONCPP_FOUND)
# Deprecated declarations.
SET (NATIVE_JSONCPP_INCLUDE_PATH ${JSONCPP_INCLUDE_DIR} )
GET_FILENAME_COMPONENT (NATIVE_JSONCPP_LIB_PATH ${JSONCPP_LIBRARY} PATH)
MARK_AS_ADVANCED(
JSONCPP_LIBRARY
JSONCPP_INCLUDE_DIR
)
indra/cmake/FindNDOF.cmake deleted 100644 → 0
+ 0
− 39
View file @ 07d388f4
# -*- cmake -*-
# - Find NDOF
# Find the NDOF includes and library
# This module defines
# NDOF_INCLUDE_DIR, where to find ndofdev_external.h, etc.
# NDOF_LIBRARY, the library needed to use NDOF.
# NDOF_FOUND, If false, do not try to use NDOF.
find_path(NDOF_INCLUDE_DIR ndofdev_external.h
PATH_SUFFIXES ndofdev
)
set(NDOF_NAMES ${NDOF_NAMES} ndofdev libndofdev)
find_library(NDOF_LIBRARY
NAMES ${NDOF_NAMES}
)
if (NDOF_LIBRARY AND NDOF_INCLUDE_DIR)
set(NDOF_FOUND "YES")
else (NDOF_LIBRARY AND NDOF_INCLUDE_DIR)
set(NDOF_FOUND "NO")
endif (NDOF_LIBRARY AND NDOF_INCLUDE_DIR)
if (NDOF_FOUND)
if (NOT NDOF_FIND_QUIETLY)
message(STATUS "Found NDOF: Library in '${NDOF_LIBRARY}' and header in '${NDOF_INCLUDE_DIR}' ")
endif (NOT NDOF_FIND_QUIETLY)
else (NDOF_FOUND)
if (NDOF_FIND_REQUIRED)
message(FATAL_ERROR " * * *\nCould not find NDOF library!\nIf you don't need Space Navigator Joystick support you can skip this test by configuring with -DNDOF:BOOL=OFF\n * * *")
endif (NDOF_FIND_REQUIRED)
endif (NDOF_FOUND)
mark_as_advanced(
NDOF_LIBRARY
NDOF_INCLUDE_DIR
)
indra/cmake/FindOpenJPEG.cmake deleted 100644 → 0
+ 0
− 50
View file @ 07d388f4
# -*- cmake -*-
# - Find OpenJPEG
# Find the OpenJPEG includes and library
# This module defines
# OPENJPEG_INCLUDE_DIR, where to find openjpeg.h, etc.
# OPENJPEG_LIBRARIES, the libraries needed to use OpenJPEG.
# OPENJPEG_FOUND, If false, do not try to use OpenJPEG.
# also defined, but not for general use are
# OPENJPEG_LIBRARY, where to find the OpenJPEG library.
FIND_PATH(OPENJPEG_INCLUDE_DIR openjpeg.h
/usr/local/include/openjpeg
/usr/local/include
/usr/include/openjpeg
/usr/include
)
SET(OPENJPEG_NAMES ${OPENJPEG_NAMES} openjpeg)
FIND_LIBRARY(OPENJPEG_LIBRARY
NAMES ${OPENJPEG_NAMES}
PATHS /usr/lib /usr/local/lib
)
IF (OPENJPEG_LIBRARY AND OPENJPEG_INCLUDE_DIR)
SET(OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARY})
SET(OPENJPEG_FOUND "YES")
ELSE (OPENJPEG_LIBRARY AND OPENJPEG_INCLUDE_DIR)
SET(OPENJPEG_FOUND "NO")
ENDIF (OPENJPEG_LIBRARY AND OPENJPEG_INCLUDE_DIR)
IF (OPENJPEG_FOUND)
IF (NOT OPENJPEG_FIND_QUIETLY)
MESSAGE(STATUS "Found OpenJPEG: ${OPENJPEG_LIBRARIES}")
ENDIF (NOT OPENJPEG_FIND_QUIETLY)
ELSE (OPENJPEG_FOUND)
IF (OPENJPEG_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find OpenJPEG library")
ENDIF (OPENJPEG_FIND_REQUIRED)
ENDIF (OPENJPEG_FOUND)
# Deprecated declarations.
SET (NATIVE_OPENJPEG_INCLUDE_PATH ${OPENJPEG_INCLUDE_DIR} )
GET_FILENAME_COMPONENT (NATIVE_OPENJPEG_LIB_PATH ${OPENJPEG_LIBRARY} PATH)
MARK_AS_ADVANCED(
OPENJPEG_LIBRARY
OPENJPEG_INCLUDE_DIR
)
indra/cmake/FindSCP.cmake deleted 100644 → 0
+ 0
− 40
View file @ 07d388f4
# -*- cmake -*-
#
# Find the OpenSSH scp ("secure copy") or Putty pscp command.
#
# Input variables:
# SCP_FIND_REQUIRED - set this if configuration should fail without scp
#
# Output variables:
#
# SCP_FOUND - set if scp was found
# SCP_EXECUTABLE - path to scp or pscp executable
# SCP_BATCH_FLAG - how to put scp/pscp into batch mode
SET(SCP_EXECUTABLE)
IF (WINDOWS)
FIND_PROGRAM(SCP_EXECUTABLE NAMES pscp pscp.exe)
ELSE (WINDOWS)
FIND_PROGRAM(SCP_EXECUTABLE NAMES scp scp.exe)
ENDIF (WINDOWS)
IF (SCP_EXECUTABLE)
SET(SCP_FOUND ON)
ELSE (SCP_EXECUTABLE)
SET(SCP_FOUND OFF)
ENDIF (SCP_EXECUTABLE)
IF (SCP_FOUND)
GET_FILENAME_COMPONENT(_scp_name ${SCP_EXECUTABLE} NAME_WE)
IF (_scp_name STREQUAL scp)
SET(SCP_BATCH_FLAG -B)
ELSE (_scp_name STREQUAL scp)
SET(SCP_BATCH_FLAG -batch)
ENDIF (_scp_name STREQUAL scp)
ELSE (SCP_FOUND)
IF (SCP_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find scp or pscp executable")
ENDIF (SCP_FIND_REQUIRED)
ENDIF (SCP_FOUND)
MARK_AS_ADVANCED(SCP_EXECUTABLE SCP_FOUND SCP_BATCH_FLAG)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment