ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

modules: updated FindCorrade.cmake, adapted to Corrade changes.

pull/77/head
Vladimír Vondruš 12 years ago
parent
a648821912
commit
2a24cc7511
3 changed files with 31 additions and 65 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      CMakeLists.txt
  2. 92
      modules/FindCorrade.cmake
  3. 2
      modules/FindMagnum.cmake

2
CMakeLists.txt
Unescape View File

@ -191,7 +191,7 @@ else()
endif() endif()
# Installation paths # Installation paths
include(CorradeLibSuffix) include(${CORRADE_LIB_SUFFIX_MODULE})
set(MAGNUM_BINARY_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin) set(MAGNUM_BINARY_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin)
set(MAGNUM_LIBRARY_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) set(MAGNUM_LIBRARY_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
set(MAGNUM_DATA_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/magnum) set(MAGNUM_DATA_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/magnum)

92
modules/FindCorrade.cmake
Unescape View File

@ -14,6 +14,7 @@
# CORRADE_TESTSUITE_LIBRARIES - TestSuite library and dependent # CORRADE_TESTSUITE_LIBRARIES - TestSuite library and dependent
# libraries # libraries
# CORRADE_RC_EXECUTABLE - Resource compiler executable # CORRADE_RC_EXECUTABLE - Resource compiler executable
# CORRADE_LIB_SUFFIX_MODULE - Path to CorradeLibSuffix.cmake module
# The package is found if either debug or release version of each library is # The package is found if either debug or release version of each library is
# found. If both debug and release libraries are found, proper version is # found. If both debug and release libraries are found, proper version is
# chosen based on actual build configuration of the project (i.e. Debug build # chosen based on actual build configuration of the project (i.e. Debug build
@ -26,9 +27,9 @@
# single-configuration build systems (such as Makefiles) this information is # single-configuration build systems (such as Makefiles) this information is
# not needed and thus the variable is not defined in any case. # not needed and thus the variable is not defined in any case.
# #
# Corrade configures the compiler to use C++11 standard. Additionally you can # Corrade configures the compiler to use C++11 standard (if it is not already
# use CORRADE_CXX_FLAGS to enable additional pedantic set of warnings and # configured to do so). Additionally you can use CORRADE_CXX_FLAGS to enable
# enable hidden visibility by default. # additional pedantic set of warnings and enable hidden visibility by default.
# #
# Features of found Corrade library are exposed in these variables: # Features of found Corrade library are exposed in these variables:
# CORRADE_GCC47_COMPATIBILITY - Defined if compiled with compatibility # CORRADE_GCC47_COMPATIBILITY - Defined if compiled with compatibility
@ -51,7 +52,7 @@
# #
# If CORRADE_BUILD_DEPRECATED is defined, the CORRADE_INCLUDE_DIR variable also # If CORRADE_BUILD_DEPRECATED is defined, the CORRADE_INCLUDE_DIR variable also
# contains path directly to Corrade directory (i.e. for includes without # contains path directly to Corrade directory (i.e. for includes without
# `Corrade/` prefix). # Corrade/ prefix).
# #
# Corrade provides these macros and functions: # Corrade provides these macros and functions:
# #
@ -111,6 +112,8 @@
# CORRADE_*_LIBRARY_DEBUG - Debug version of given library, if found # CORRADE_*_LIBRARY_DEBUG - Debug version of given library, if found
# CORRADE_*_LIBRARY_RELEASE - Release version of given library, if # CORRADE_*_LIBRARY_RELEASE - Release version of given library, if
# found # found
# CORRADE_USE_MODULE - Path to UseCorrade.cmake module (included
# automatically)
# #
# #
@ -174,12 +177,6 @@ find_path(_CORRADE_MODULE_DIR
NAMES UseCorrade.cmake CorradeLibSuffix.cmake NAMES UseCorrade.cmake CorradeLibSuffix.cmake
PATH_SUFFIXES share/cmake/Corrade) PATH_SUFFIXES share/cmake/Corrade)
# If not found, try system module dir
find_path(_CORRADE_MODULE_DIR
NAMES UseCorrade.cmake CorradeLibSuffix.cmake
PATHS ${CMAKE_ROOT}/Modules
NO_CMAKE_FIND_ROOT_PATH)
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Corrade DEFAULT_MSG find_package_handle_standard_args(Corrade DEFAULT_MSG
CORRADE_UTILITY_LIBRARY CORRADE_UTILITY_LIBRARY
@ -194,59 +191,33 @@ if(NOT CORRADE_FOUND)
return() return()
endif() endif()
# Configuration # Read flags from fonfiguration
file(READ ${_CORRADE_INCLUDE_DIR}/Corrade/configure.h _corradeConfigure) file(READ ${_CORRADE_INCLUDE_DIR}/Corrade/configure.h _corradeConfigure)
set(_corradeFlags
# Compatibility? GCC47_COMPATIBILITY
string(FIND "${_corradeConfigure}" "#define CORRADE_GCC47_COMPATIBILITY" _GCC47_COMPATIBILITY) BUILD_DEPRECATED
if(NOT _GCC47_COMPATIBILITY EQUAL -1) BUILD_STATIC
set(CORRADE_GCC47_COMPATIBILITY 1) TARGET_UNIX
endif() TARGET_APPLE
string(FIND "${_corradeConfigure}" "#define CORRADE_BUILD_DEPRECATED" _BUILD_DEPRECATED) TARGET_WINDOWS
if(NOT _BUILD_DEPRECATED EQUAL -1) TARGET_NACL
set(CORRADE_BUILD_DEPRECATED 1) TARGET_NACL_NEWLIB
endif() TARGET_NACL_GLIBC
string(FIND "${_corradeConfigure}" "#define CORRADE_BUILD_STATIC" _BUILD_STATIC) TARGET_EMSCRIPTEN
if(NOT _BUILD_STATIC EQUAL -1) TARGET_ANDROID)
set(CORRADE_BUILD_STATIC 1) foreach(_corradeFlag ${_corradeFlags})
endif() string(FIND "${_corradeConfigure}" "#define CORRADE_${_corradeFlag}" _corrade_${_corradeFlag})
string(FIND "${_corradeConfigure}" "#define CORRADE_TARGET_UNIX" _TARGET_UNIX) if(NOT _corrade_${_corradeFlag} EQUAL -1)
if(NOT _TARGET_UNIX EQUAL -1) set(CORRADE_${_corradeFlag} 1)
set(CORRADE_TARGET_UNIX 1) endif()
endif() endforeach()
string(FIND "${_corradeConfigure}" "#define CORRADE_TARGET_APPLE" _TARGET_APPLE)
if(NOT _TARGET_APPLE EQUAL -1)
set(CORRADE_TARGET_APPLE 1)
endif()
string(FIND "${_corradeConfigure}" "#define CORRADE_TARGET_WINDOWS" _TARGET_WINDOWS)
if(NOT _TARGET_WINDOWS EQUAL -1)
set(CORRADE_TARGET_WINDOWS 1)
endif()
string(FIND "${_corradeConfigure}" "#define CORRADE_TARGET_NACL" _TARGET_NACL)
if(NOT _TARGET_NACL EQUAL -1)
set(CORRADE_TARGET_NACL 1)
endif()
string(FIND "${_corradeConfigure}" "#define CORRADE_TARGET_NACL_NEWLIB" _TARGET_NACL_NEWLIB)
if(NOT _TARGET_NACL_NEWLIB EQUAL -1)
set(CORRADE_TARGET_NACL_NEWLIB 1)
endif()
string(FIND "${_corradeConfigure}" "#define CORRADE_TARGET_NACL_GLIBC" _TARGET_NACL_GLIBC)
if(NOT _TARGET_NACL_GLIBC EQUAL -1)
set(CORRADE_TARGET_NACL_GLIBC 1)
endif()
string(FIND "${_corradeConfigure}" "#define CORRADE_TARGET_EMSCRIPTEN" _TARGET_EMSCRIPTEN)
if(NOT _TARGET_EMSCRIPTEN EQUAL -1)
set(CORRADE_TARGET_EMSCRIPTEN 1)
endif()
string(FIND "${_corradeConfigure}" "#define CORRADE_TARGET_ANDROID" _TARGET_ANDROID)
if(NOT _TARGET_ANDROID EQUAL -1)
set(CORRADE_TARGET_ANDROID 1)
endif()
set(CORRADE_UTILITY_LIBRARIES ${CORRADE_UTILITY_LIBRARY}) set(CORRADE_UTILITY_LIBRARIES ${CORRADE_UTILITY_LIBRARY})
set(CORRADE_INTERCONNECT_LIBRARIES ${CORRADE_INTERCONNECT_LIBRARY} ${CORRADE_UTILITY_LIBRARIES}) set(CORRADE_INTERCONNECT_LIBRARIES ${CORRADE_INTERCONNECT_LIBRARY} ${CORRADE_UTILITY_LIBRARIES})
set(CORRADE_PLUGINMANAGER_LIBRARIES ${CORRADE_PLUGINMANAGER_LIBRARY} ${CORRADE_UTILITY_LIBRARIES}) set(CORRADE_PLUGINMANAGER_LIBRARIES ${CORRADE_PLUGINMANAGER_LIBRARY} ${CORRADE_UTILITY_LIBRARIES})
set(CORRADE_TESTSUITE_LIBRARIES ${CORRADE_TESTSUITE_LIBRARY} ${CORRADE_UTILITY_LIBRARIES}) set(CORRADE_TESTSUITE_LIBRARIES ${CORRADE_TESTSUITE_LIBRARY} ${CORRADE_UTILITY_LIBRARIES})
set(CORRADE_USE_MODULE ${_CORRADE_MODULE_DIR}/UseCorrade.cmake)
set(CORRADE_LIB_SUFFIX_MODULE ${_CORRADE_MODULE_DIR}/CorradeLibSuffix.cmake)
# At least static build needs this # At least static build needs this
if(CORRADE_TARGET_UNIX OR CORRADE_TARGET_NACL_GLIBC) if(CORRADE_TARGET_UNIX OR CORRADE_TARGET_NACL_GLIBC)
@ -268,10 +239,5 @@ else()
set(CORRADE_INCLUDE_DIR ${_CORRADE_INCLUDE_DIR}) set(CORRADE_INCLUDE_DIR ${_CORRADE_INCLUDE_DIR})
endif() endif()
# Include our module dir, if we have any
if(NOT "${_CORRADE_MODULE_DIR}" STREQUAL "${CMAKE_ROOT}/Modules")
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${_CORRADE_MODULE_DIR}")
endif()
# Finalize the finding process # Finalize the finding process
include(UseCorrade) include(${CORRADE_USE_MODULE})

2
modules/FindMagnum.cmake
Unescape View File

@ -533,7 +533,7 @@ find_package_handle_standard_args(Magnum
HANDLE_COMPONENTS) HANDLE_COMPONENTS)
# Installation dirs # Installation dirs
include(CorradeLibSuffix) include(${CORRADE_LIB_SUFFIX_MODULE})
set(MAGNUM_BINARY_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin) set(MAGNUM_BINARY_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin)
set(MAGNUM_LIBRARY_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) set(MAGNUM_LIBRARY_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
set(MAGNUM_PLUGINS_DEBUG_INSTALL_DIR ${MAGNUM_LIBRARY_INSTALL_DIR}/magnum-d) set(MAGNUM_PLUGINS_DEBUG_INSTALL_DIR ${MAGNUM_LIBRARY_INSTALL_DIR}/magnum-d)

Write Preview
Loading…
Cancel
Save