CMake: User-friendliness; don't try to install from deployed bin folder

skyjake · Feb 23, 2015 · 5206343 · 5206343
1 parent e011973
commit 5206343
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/doomsday/apps/plugins/directsound/CMakeLists.txt b/doomsday/apps/plugins/directsound/CMakeLists.txt
@@ -11,4 +11,6 @@ if (TARGET EAX2)
 
     deng_add_plugin (audio_directsound ${SOURCES})
     target_link_libraries (audio_directsound PRIVATE DirectX EAX2)
+else ()	
+	message (STATUS "audio_directsound will not be built because EAX2 is missing.")
 endif ()
diff --git a/doomsday/apps/plugins/fmod/CMakeLists.txt b/doomsday/apps/plugins/fmod/CMakeLists.txt
@@ -24,4 +24,6 @@ if (TARGET fmodex)
     if (APPLE)
         deng_bundle_install_names (audio_fmod ${libPath})
     endif ()
+else ()
+	message (STATUS "audio_fmod will not be built because FMOD is missing.")
 endif ()
diff --git a/doomsday/cmake/FindAssimp.cmake b/doomsday/cmake/FindAssimp.cmake
@@ -17,14 +17,17 @@ if (NOT TARGET assimp)
     else ()
         # Try to find assimp manually.
         find_library (LIBASSIMP assimp
-            PATHS ${DENG_EXTERNAL_SOURCE_DIR}/assimp
+            PATHS 
+				${DENG_EXTERNAL_SOURCE_DIR}/assimp
+				${ASSIMP_DIR}
             PATH_SUFFIXES lib/Release lib/Debug lib
+			NO_DEFAULT_PATH
         )        
     endif ()
     mark_as_advanced (LIBASSIMP)
 
     if (NOT LIBASSIMP)
-        message (FATAL_ERROR "Open Asset Import Library not found. Go to doomsday/external/assimp, compile, and install.\n")
+        message (FATAL_ERROR "Open Asset Import Library not found. Go to doomsday/external/assimp, compile, and install. You can also set the ASSIMP_DIR variable to specify the location.")
     endif ()
 
     add_library (assimp INTERFACE)
@@ -56,8 +59,8 @@ if (NOT TARGET assimp)
         deng_install_library (${LIBASSIMP})
     else ()
         # Locate the DLL.
-        find_file (LIBASSIMP_DLL assimp.dll HINTS ${_assimpBase}/..
-            PATH_SUFFIXES bin ../bin/Release ../bin/Debug
+        find_file (LIBASSIMP_DLL assimp.dll PATHS ${_assimpBase}/..
+            PATH_SUFFIXES ../bin/Release ../bin/Debug
         )
         mark_as_advanced (LIBASSIMP_DLL)
         get_filename_component (LIBASSIMP_DLL ${LIBASSIMP_DLL} REALPATH)

diff --git a/doomsday/cmake/FindEAX.cmake b/doomsday/cmake/FindEAX.cmake
@@ -6,11 +6,11 @@ if (WIN32)
         if (EAX2_LIBRARY)
             message (STATUS "Looking for EAX 2 - found")
         else ()
-            message (STATUS "Looking for EAX 2 - not found")
+            message (STATUS "Looking for EAX 2 - not found (set the EAX2_DIR variable)")
         endif ()
     endif ()
 
-    if (NOT TARGET EAX2)
+    if (EAX2_LIBRARY AND NOT TARGET EAX2)
         add_library (EAX2 INTERFACE)
         get_filename_component (_libDir ${EAX2_LIBRARY} DIRECTORY)
         target_include_directories (EAX2 INTERFACE ${_libDir}/../Include)

diff --git a/doomsday/cmake/FindFMOD.cmake b/doomsday/cmake/FindFMOD.cmake
@@ -15,7 +15,7 @@ if (NOT _oldPath STREQUAL FMOD_FMOD_H)
     if (FMOD_FMOD_H)
         message (STATUS "Looking for FMOD Ex - found")
     else ()
-        message (STATUS "Looking for FMOD Ex - not found")
+        message (STATUS "Looking for FMOD Ex - not found (set the FMOD_DIR variable)")
     endif ()
 endif ()
 

diff --git a/doomsday/cmake/OpenGL.cmake b/doomsday/cmake/OpenGL.cmake
@@ -7,7 +7,7 @@ if (NOT TARGET opengl)
     )
     mark_as_advanced (OPENGL_GLEXT_H)
     if (NOT OPENGL_GLEXT_H)
-        message (FATAL_ERROR "OpenGL \"GL/glext.h\" header not found.")
+        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)