teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Fix cmake modules

Browse source
This commit is contained in:
Koncord 2016-07-12 20:37:39 +08:00
parent 1d5f0bd38f
commit 1a32385632
2 changed files with 10 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cmake/FindRakNet.cmake
View file

@ -6,15 +6,7 @@
# RakNet_INCLUDES - the RakNet include directory # RakNet_INCLUDES - the RakNet include directory
# RakNet_LIBRARY - Link these to use RakNet # RakNet_LIBRARY - Link these to use RakNet
if(Win32) FIND_LIBRARY (RakNet_LIBRARY_RELEASE NAMES RakNetLibStatic
SET(RakNet_LIBRARY_Name RakNetLibStatic)
SET(RakNet_LIBRARY_Name_Debug RakNetLibStaticDebug)
else(Win32)
SET(RakNet_LIBRARY_Name RakNetStatic)
SET(RakNet_LIBRARY_Name_Debug RakNetStatic_Debug)
endif(Win32)
FIND_LIBRARY (RakNet_LIBRARY_RELEASE NAMES ${RakNet_LIBRARY_Name}
PATHS PATHS
ENV LD_LIBRARY_PATH ENV LD_LIBRARY_PATH
ENV LIBRARY_PATH ENV LIBRARY_PATH
@ -23,10 +15,10 @@ FIND_LIBRARY (RakNet_LIBRARY_RELEASE NAMES ${RakNet_LIBRARY_Name}
/usr/local/lib64 /usr/local/lib64
/usr/local/lib /usr/local/lib
/opt/local/lib /opt/local/lib
${RAKNET_ROOT}/lib $ENV{RAKNET_ROOT}/lib
) )
FIND_LIBRARY (RakNet_LIBRARY_DEBUG NAMES ${RakNet_LIBRARY_Name_Debug} FIND_LIBRARY (RakNet_LIBRARY_DEBUG NAMES RakNetLibStatic
PATHS PATHS
ENV LD_LIBRARY_PATH ENV LD_LIBRARY_PATH
ENV LIBRARY_PATH ENV LIBRARY_PATH
@ -35,7 +27,7 @@ FIND_LIBRARY (RakNet_LIBRARY_DEBUG NAMES ${RakNet_LIBRARY_Name_Debug}
/usr/local/lib64 /usr/local/lib64
/usr/local/lib /usr/local/lib
/opt/local/lib /opt/local/lib
${RAKNET_ROOT}/lib $ENV{RAKNET_ROOT}/lib
) )
@ -45,7 +37,7 @@ FIND_PATH (RakNet_INCLUDES raknet/RakPeer.h
/usr/include /usr/include
/usr/local/include /usr/local/include
/opt/local/include /opt/local/include
${RAKNET_ROOT}/include $ENV{RAKNET_ROOT}/include
) )
IF(RakNet_INCLUDES AND RakNet_LIBRARY_RELEASE) IF(RakNet_INCLUDES AND RakNet_LIBRARY_RELEASE)

19
cmake/FindTerra.cmake
View file

@ -5,13 +5,7 @@
# Terra_INCLUDES - the Terra include directory # Terra_INCLUDES - the Terra include directory
# Terra_LIBRARY - Link these to use Terra # Terra_LIBRARY - Link these to use Terra
if(Win32) FIND_LIBRARY (Terra_LIBRARY_RELEASE NAMES terra
SET(Terra_LIBRARY_Name terra.so)
else(Win32)
SET(Terra_LIBRARY_Name terra)
endif(Win32)
FIND_LIBRARY (Terra_LIBRARY_RELEASE NAMES ${Terra_LIBRARY_Name}
PATHS PATHS
ENV LD_LIBRARY_PATH ENV LD_LIBRARY_PATH
ENV LIBRARY_PATH ENV LIBRARY_PATH
@ -20,11 +14,10 @@ FIND_LIBRARY (Terra_LIBRARY_RELEASE NAMES ${Terra_LIBRARY_Name}
/usr/local/lib64 /usr/local/lib64
/usr/local/lib /usr/local/lib
/opt/local/lib /opt/local/lib
${Terra_ROOT}/lib $ENV{Terra_ROOT}/lib
${Terra_DIR}/lib
) )
FIND_LIBRARY (Terra_LIBRARY_DEBUG NAMES ${Terra_LIBRARY_Name_Debug} FIND_LIBRARY (Terra_LIBRARY_DEBUG NAMES terra
PATHS PATHS
ENV LD_LIBRARY_PATH ENV LD_LIBRARY_PATH
ENV LIBRARY_PATH ENV LIBRARY_PATH
@ -33,8 +26,7 @@ FIND_LIBRARY (Terra_LIBRARY_DEBUG NAMES ${Terra_LIBRARY_Name_Debug}
/usr/local/lib64 /usr/local/lib64
/usr/local/lib /usr/local/lib
/opt/local/lib /opt/local/lib
${Terra_ROOT}/lib $ENV{Terra_ROOT}/lib
${Terra_DIR}/lib
) )
@ -44,8 +36,7 @@ FIND_PATH (Terra_INCLUDES terra/terra.h
/usr/include /usr/include
/usr/local/include /usr/local/include
/opt/local/include /opt/local/include
${Terra_ROOT}/include $ENV{Terra_ROOT}/include
${Terra_DIR}/include
) )
IF(Terra_INCLUDES AND Terra_LIBRARY_RELEASE) IF(Terra_INCLUDES AND Terra_LIBRARY_RELEASE)