mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Rewrites FindLIBUNSHIELD using LibFindMacros

Browse Source 
Renames LIBUNSHIELD_INCLUDE_DIR -> LIBUNSHIELD_INCLUDE_DIRS, LIBUNSHIELD_LIBRARY -> LIBUNSHIELD_LIBRARIES
pull/1/head
Roman Proskuryakov 9 years ago
parent 4acfe1a7e4
commit edb41b5b08
3 changed files with 27 additions and 45 deletions
Show Stats Download Patch File Download Diff File

5
CMakeLists.txt
Unescape Escape View File

@ -182,6 +182,11 @@ if (WIN32)
add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN) add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN)
endif() endif()
if (NOT WIN32 AND BUILD_WIZARD) # windows users can just run the morrowind installer
find_package(LIBUNSHIELD REQUIRED) # required only for non win32 when building openmw-wizard
set(OPENMW_USE_UNSHIELD TRUE)
endif()
option(OPENGL_ES "enable opengl es support" FALSE ) option(OPENGL_ES "enable opengl es support" FALSE )
if (OPENGL_ES) if (OPENGL_ES)

14
apps/wizard/CMakeLists.txt
Unescape Escape View File

@ -1,13 +1,3 @@
if (WIN32) # windows users can just run the morrowind installer
set(OPENMW_USE_UNSHIELD FALSE)
else()
set(OPENMW_USE_UNSHIELD TRUE)
find_package(LIBUNSHIELD REQUIRED)
if(NOT LIBUNSHIELD_FOUND)
message(FATAL_ERROR "Failed to find Unshield library")
endif(NOT LIBUNSHIELD_FOUND)
endif()
set(WIZARD set(WIZARD
componentselectionpage.cpp componentselectionpage.cpp
@ -103,7 +93,7 @@ endif()
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
if (OPENMW_USE_UNSHIELD) if (OPENMW_USE_UNSHIELD)
include_directories(${LIBUNSHIELD_INCLUDE_DIR}) include_directories(${LIBUNSHIELD_INCLUDE_DIRS})
endif() endif()
add_executable(openmw-wizard add_executable(openmw-wizard
@ -132,7 +122,7 @@ else()
endif() endif()
if (OPENMW_USE_UNSHIELD) if (OPENMW_USE_UNSHIELD)
target_link_libraries(openmw-wizard ${LIBUNSHIELD_LIBRARY}) target_link_libraries(openmw-wizard ${LIBUNSHIELD_LIBRARIES})
endif() endif()

53
cmake/FindLIBUNSHIELD.cmake
Unescape Escape View File

@ -1,8 +1,8 @@
# Locate LIBUNSHIELD # Locate LIBUNSHIELD
# This module defines # This module defines
# LIBUNSHIELD_LIBRARY # LIBUNSHIELD_LIBRARIES
# LIBUNSHIELD_FOUND, if false, do not try to link to LibUnshield # LIBUNSHIELD_FOUND, if false, do not try to link to LibUnshield
# LIBUNSHIELD_INCLUDE_DIR, where to find the headers # LIBUNSHIELD_INCLUDE_DIRS, where to find the headers
# #
# Created by Tom Mason (wheybags) for OpenMW (http://openmw.org), based on FindMPG123.cmake # Created by Tom Mason (wheybags) for OpenMW (http://openmw.org), based on FindMPG123.cmake
# #
@ -12,37 +12,24 @@
# function. Do we really need to repeat this stuff for every single # function. Do we really need to repeat this stuff for every single
# library when they all work the same? </today's rant> # library when they all work the same? </today's rant>
FIND_PATH(LIBUNSHIELD_INCLUDE_DIR libunshield.h include(LibFindMacros)
HINTS
PATHS
~/Library/Frameworks
/Library/Frameworks
/usr/local
/usr
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
/opt
/usr/include
)
FIND_LIBRARY(LIBUNSHIELD_LIBRARY set(POSSIBLE_LOCATIONS
unshield ~/Library/Frameworks
HINTS /Library/Frameworks
# PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64 /usr/local
PATHS /usr
~/Library/Frameworks /sw # Fink
/Library/Frameworks /opt/local # DarwinPorts
/usr/local /opt/csw # Blastwave
/usr /opt
/sw /usr/include
/opt/local
/opt/csw
/opt
/usr/lib
) )
IF(LIBUNSHIELD_LIBRARY AND LIBUNSHIELD_INCLUDE_DIR) libfind_pkg_detect(LIBUNSHIELD libunshield
SET(LIBUNSHIELD_FOUND "YES") FIND_PATH libunshield.h
ENDIF(LIBUNSHIELD_LIBRARY AND LIBUNSHIELD_INCLUDE_DIR) HINTS ${POSSIBLE_LOCATIONS}
FIND_LIBRARY unshield
HINTS ${POSSIBLE_LOCATIONS}
)
libfind_process(LIBUNSHIELD)

Write Preview
Loading…
Cancel
Save