CMake: Check environment variable DENG_DEPEND_PATH; cleanup

cotire is now disabled by default if ccache is found.

doomsday/cmake/Config.cmake

@@ -71,5 +71,7 @@ endif ()
 set (Python_ADDITIONAL_VERSIONS 2.7)
 find_package (PythonInterp REQUIRED)
 
-include (cotire)
+if (DENG_ENABLE_COTIRE)
+    include (cotire)
+endif ()
 include (LegacyPK3s)

doomsday/cmake/FindCcache.cmake

@@ -1,6 +1,6 @@
 find_program (CCACHE_PROGRAM ccache)
 
-if (NOT CCACHE_PROGRAM STREQUAL "CCACHE_PROGRAM-NOTFOUND")
+if (CCACHE_PROGRAM)
     set (CCACHE_FOUND YES)
     set (CCACHE_OPTION_DEFAULT ON)
 else ()

doomsday/cmake/FindFMOD.cmake

@@ -3,10 +3,9 @@ set (FMOD_DIR "" CACHE PATH "Location of the FMOD Programmer's API SDK")
 set (_oldPath ${FMOD_FMOD_H})
 
 find_file (FMOD_FMOD_H api/inc/fmod.h
-    PATHS 
-        "${FMOD_DIR}"
-        "${FMOD_DIR}/FMOD"        
-        "${FMOD_DIR}/FMOD Programmers API"
+    PATHS "${FMOD_DIR}"
+    HINTS ENV DENG_DEPEND_PATH
+    PATH_SUFFIXES "FMOD" "FMOD Programmers API"
     NO_DEFAULT_PATH
 )
 mark_as_advanced (FMOD_FMOD_H)
@@ -19,7 +18,7 @@ if (NOT _oldPath STREQUAL FMOD_FMOD_H)
     endif ()
 endif ()
 
-if (NOT FMOD_FMOD_H STREQUAL "FMOD_FMOD_H-NOTFOUND" AND NOT TARGET fmodex)
+if (FMOD_FMOD_H AND NOT TARGET fmodex)
     get_filename_component (fmodInc "${FMOD_FMOD_H}" DIRECTORY)
     get_filename_component (fmodApi "${fmodInc}" DIRECTORY)
 

doomsday/cmake/FindGlib.cmake

@@ -5,37 +5,3 @@ add_pkgconfig_interface_library (glib glib-2.0 gthread-2.0)
 get_property (GLIB_LIBRARIES TARGET glib 
     PROPERTY INTERFACE_LINK_LIBRARIES
 )
-
-#--------
-#
-# pkg_check_modules (GLIB REQUIRED glib-2.0)
-# pkg_check_modules (GTHREAD REQUIRED gthread-2.0)
-#
-# # Locate full paths of the required shared libraries.
-# set (libNames ${GLIB_LIBRARIES} ${GTHREAD_LIBRARIES})
-# list (REMOVE_DUPLICATES libNames)
-# foreach (lib ${libNames})
-#     find_library (path ${lib} HINTS ${GLIB_LIBRARY_DIRS};${GTHREAD_LIBRARY_DIRS})
-#     list (APPEND libs ${path})
-#     unset (path CACHE)
-# endforeach (lib)
-#
-# # set (incDirs ${GLIB_INCLUDE_DIRS} ${GTHREAD_INCLUDE_DIRS})
-# # list (REMOVE_DUPLICATES incDirs)
-#
-# # Define an interface library for GLib.
-# add_library (glib INTERFACE)
-# target_compile_options (glib INTERFACE ${GLIB_CFLAGS} ${GTHREAD_CFLAGS})
-# target_link_libraries (glib INTERFACE ${libs})
-#
-# unset (GLIB_LIBRARIES CACHE)
-# foreach (lib ${libs})
-#     get_filename_component (p ${lib} REALPATH)
-#     list (APPEND GLIB_LIBRARIES ${p})
-# endforeach (lib)
-# #message ("GLIB_LIBRARIES: ${GLIB_LIBRARIES}")
-#
-# # unset (incDirs)
-# unset (libNames)
-# unset (lib)
-# unset (libs)

doomsday/cmake/FindLZSS.cmake

@@ -6,6 +6,7 @@ if (TARGET lzss)
 endif ()
 
 if (WIN32)
+    # Use the prebuilt library.
     add_library (lzss INTERFACE)
     target_include_directories (lzss INTERFACE "${DENG_LZSS_DIR}/portable/include")
     target_link_libraries (lzss INTERFACE "${DENG_LZSS_DIR}/win32/lzss.lib")

doomsday/cmake/FindOculusVR.cmake

@@ -3,10 +3,9 @@ set (LIBOVR_DIR "" CACHE PATH "Location of the LibOVR library (in the Oculus SDK
 set (_oldPath ${LIBOVR_OVR_H})
 
 find_file (LIBOVR_OVR_H Include/OVR.h
-    PATHS 
-        "${LIBOVR_DIR}"
-        "${LIBOVR_DIR}/LibOVR"
-        "${LIBOVR_DIR}/OculusSDK/LibOVR"
+    PATHS "${LIBOVR_DIR}" 
+    HINTS ENV DENG_DEPEND_PATH
+    PATH_SUFFIXES LibOVR OculusSDK/LibOVR
     NO_DEFAULT_PATH
 )
 mark_as_advanced (LIBOVR_OVR_H)
@@ -15,11 +14,11 @@ if (NOT _oldPath STREQUAL LIBOVR_OVR_H)
     if (LIBOVR_OVR_H)
         message (STATUS "Looking for LibOVR - found")
     else ()
-        message (STATUS "Looking for LibOVR - not found")
+        message (STATUS "Looking for LibOVR - not found (set the LIBOVR_DIR variable)")
     endif ()
 endif ()
 
-if (NOT LIBOVR_OVR_H STREQUAL "LIBOVR_OVR_H-NOTFOUND")
+if (LIBOVR_OVR_H)
     if (NOT TARGET LibOVR)
         get_filename_component (ovrDir "${LIBOVR_OVR_H}" DIRECTORY)
         get_filename_component (ovrDir "${ovrDir}" DIRECTORY)

doomsday/cmake/FindQt.cmake

@@ -2,6 +2,7 @@
 if (NOT QMAKE)
     find_program (QMAKE qmake-qt5 qt5-qmake qmake
         PATHS ENV PATH
+        HINTS ENV DENG_DEPEND_PATH
         DOC "Path of the qmake executable to use"
     ) 
 endif ()

doomsday/cmake/FindSDL2.cmake

@@ -6,7 +6,12 @@ if (PKG_CONFIG_FOUND)
 elseif (WIN32)
     # Try to locate SDL2 from the local system (assuming Windows).
     set (_oldPath ${SDL2_LIBRARY})
-    find_library (SDL2_LIBRARY SDL2 HINTS ${SDL2_DIR} PATH_SUFFIXES lib/x86 lib)    
+    file (GLOB _hints ${SDL2_DIR}/SDL2*)
+    find_library (SDL2_LIBRARY SDL2 
+        PATHS ${SDL2_DIR} 
+        HINTS ${_hints} ENV DENG_DEPEND_PATH
+        PATH_SUFFIXES lib/x86 lib
+    )
     mark_as_advanced (SDL2_LIBRARY)
     if (NOT SDL2_LIBRARY)
         message (FATAL_ERROR "SDL2 not found. Set the SDL2_DIR variable to help locate it.\n")
@@ -28,8 +33,10 @@ elseif (WIN32)
 
     # Also attempt to locate SLD2_mixer.
     set (_oldPath ${SDL_MIXER_LIBRARY})
+    file (GLOB _hints ${SDL2_DIR}/SDL2_mixer* ${SDL2_MIXER_DIR}/SDL2_mixer*)
     find_library (SDL2_MIXER_LIBRARY SDL2_mixer
-        HINTS ${SDL2_DIR} ${SDL2_MIXER_DIR}
+        PATHS ${SDL2_DIR} ${SDL2_MIXER_DIR}
+        HINTS ${_hints} ENV DENG_DEPEND_PATH
         PATH_SUFFIXES lib/x86 lib
     )    
     mark_as_advanced (SDL2_MIXER_LIBRARY)

doomsday/cmake/OpenGL.cmake

@@ -1,18 +1,25 @@
 find_package (OpenGL REQUIRED)
 
 if (NOT TARGET opengl)
-    find_file (OPENGL_GLEXT_H GL/glext.h
-        HINTS ${OPENGL_DIR}
-        PATH_SUFFIXES .. OpenGL include OpenGL/include
-    )
-    mark_as_advanced (OPENGL_GLEXT_H)
-    if (NOT OPENGL_GLEXT_H)
-        message (FATAL_ERROR "OpenGL \"GL/glext.h\" header not found. Set the OPENGL_DIR variable to specify the location of the OpenGL headers.")
-    endif ()
+    add_library (opengl INTERFACE)
+
+    if (NOT OPENGL_INCLUDE_DIR)
+        # Let's look manually.
+        find_file (OPENGL_GLEXT_H GL/glext.h
+            PATHS ${OPENGL_DIR}
+            HINTS ${OPENGL_LIBRARIES} ENV DENG_DEPEND_PATH
+            PATH_SUFFIXES .. OpenGL include OpenGL/include Headers
+        )
+        mark_as_advanced (OPENGL_GLEXT_H)
+        if (NOT OPENGL_GLEXT_H)
+            message (FATAL_ERROR "OpenGL \"GL/glext.h\" header not found. Set the OPENGL_DIR variable to specify the location of the OpenGL headers.")
+        endif ()
 
-    get_filename_component (glIncDir ${OPENGL_GLEXT_H} DIRECTORY)    
+        get_filename_component (glIncDir ${OPENGL_GLEXT_H} DIRECTORY)    
+        target_include_directories (opengl INTERFACE ${glIncDir}/..)
+    else ()
+        target_include_directories (opengl INTERFACE ${OPENGL_INCLUDE_DIR})
+    endif ()
 
-    add_library (opengl INTERFACE)
-    target_include_directories (opengl INTERFACE ${OPENGL_INCLUDE_DIR} ${glIncDir}/..)
     target_link_libraries (opengl INTERFACE ${OPENGL_LIBRARIES})
 endif ()

doomsday/cmake/Options.cmake

@@ -1,5 +1,13 @@
 option (DENG_ENABLE_GUI "Enable/disable the client and all GUI related functionality" ON)
-option (DENG_ENABLE_COTIRE "Enable/disable precompiled headers (cotire) for faster builds" ON)
+
+if (CCACHE_FOUND)
+    set (DENG_ENABLE_COTIRE_DEFAULT OFF) # just use the cache
+else ()
+    set (DENG_ENABLE_COTIRE_DEFAULT ON)
+endif ()
+option (DENG_ENABLE_COTIRE "Enable/disable precompiled headers (cotire) for faster builds"
+    ${DENG_ENABLE_COTIRE_DEFAULT}
+)
 
 option (DENG_FIXED_ASM 
     "Use inline assembler for fixed-point math"