Merge pull request #49 from dooglz/Cmake_fixes

Add cmake options to specify dependant lib locations

2 files changed, 158 insertions, 96 deletions

diff --git a/DevIL/CMakeLists.txt b/DevIL/CMakeLists.txt
index 305f272e..a26f8eac 100644
--- a/DevIL/CMakeLists.txt
+++ b/DevIL/CMakeLists.txt
@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 2.6)
 
 project(ImageLib)
+# include our custom modules
+set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
 
 add_subdirectory(src-IL)
 add_subdirectory(src-ILU)
diff --git a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt
index 095f43e7..7a0f87d8 100644
--- a/DevIL/src-IL/CMakeLists.txt
+++ b/DevIL/src-IL/CMakeLists.txt
@@ -1,9 +1,6 @@
-cmake_minimum_required(VERSION 2.6)
-
+cmake_minimum_required(VERSION 2.8)
 project(DevIL)
 
-# include our custom modules
-set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 include (TestBigEndian)
 
 option(BUILD_SHARED_LIBS "Build with shared (.DLL .SO) libraries." ON)
@@ -17,13 +14,12 @@ file(GLOB DevIL_RSRC)
 file(GLOB DevIL_TXT)
 
 # From http://stackoverflow.com/questions/17317350/compiling-32-and-64-bit
-MESSAGE(" ")
 if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
-    MESSAGE( "64 bit compiler detected" )
+    MESSAGE( "DevIL, 64 bit compiler detected" )
     SET( EX_PLATFORM 64 )
     SET( EX_PLATFORM_NAME "x64" )
 else( CMAKE_SIZEOF_VOID_P EQUAL 8 ) 
-    MESSAGE( "32 bit compiler detected" )
+    MESSAGE( "DevIL, 32 bit compiler detected" )
     SET( EX_PLATFORM 32 )
     SET( EX_PLATFORM_NAME "x86" )
 endif( CMAKE_SIZEOF_VOID_P EQUAL 8 )
@@ -63,25 +59,72 @@ else(BUILD_SHARED_LIBS)
     add_library(IL ${DevIL_SRCS} ${DevIL_INC} ${DevIL_RSRC} ${DevIL_TXT})
 endif(BUILD_SHARED_LIBS)
 
-
-
-
 # various compiler stuff
 test_big_endian(WORDS_BIGENDIAN)
 
 
-# check availability of optional external libs
-find_package(PNG)
-find_package(TIFF)
-find_package(JPEG)
-find_package(Jasper)
+# Check availability of optional external libs, 
+# Allow users to specify manual locations in their own cmake file like so:
+# SET(IL_JPEG_LIB ON CACHE BOOL "" FORCE) 
+# SET(JPEG_INCLUDE_DIRS ...)
+# SET(JPEG_LIBRARIES ...)
+
+#LibPng
+option(IL_PNG_LIB "Custom location for LibPng" OFF)
+if(NOT IL_PNG_LIB)
+  find_package(PNG)
+endif(NOT IL_PNG_LIB)
+
+#LibJpeg
+option(IL_JPEG_LIB "Custom location for LibJPEG" OFF)
+if(NOT IL_JPEG_LIB)
+  find_package(JPEG)
+endif(NOT IL_JPEG_LIB)
+
+#TIFF
+option(IL_TIFF_LIB "Custom location for TIFF lib" OFF)
+if(NOT IL_TIFF_LIB)
+  find_package(TIFF)
+endif(NOT IL_TIFF_LIB)
+
+#Jasper
+option(IL_JASPER_LIB "Custom location for Jasper" OFF)
+if(NOT IL_JASPER_LIB)
+  find_package(Jasper)
+endif(NOT IL_JASPER_LIB)
+
+#Squish
+option(IL_SQUISH_LIB "Custom location for libSquish" OFF)
+if(NOT IL_SQUISH_LIB)
 #find_package(Squish)
-find_package(libSquish)
-find_package(NVTT)      # NVidia texture tools
-find_package(OpenEXR)
-#find_package(LCMS)
-find_package(LCMS2)
-find_package(MNG)
+  find_package(libSquish)
+endif(NOT IL_SQUISH_LIB)
+
+# NVidia texture tools
+option(IL_NVTT_LIB "Custom location for NVTT" OFF)
+if(NOT IL_NVTT_LIB)
+  find_package(NVTT)
+endif(NOT IL_NVTT_LIB)
+
+#OpenEXR
+option(IL_OPENEXR_LIB "Custom location for OpenEXR" OFF)
+if(NOT IL_OPENEXR_LIB)
+  find_package(OpenEXR)
+endif(NOT IL_OPENEXR_LIB)
+
+#LCMS2
+option(IL_LCMS2_LIB "Custom location for LCMS2" OFF)
+if(NOT IL_LCMS2_LIB)
+  #find_package(LCMS)
+  find_package(LCMS2)
+endif(NOT IL_LCMS2_LIB)
+
+#MNG
+option(IL_MNG_LIB "Custom location for MNG" OFF)
+if(NOT IL_MNG_LIB)
+  find_package(MNG)
+endif(NOT IL_MNG_LIB)
+
 # TODO: check for libmng, others?
 
 # TODO: WDP requires Microsoft HD Photo Device Porting Kit 1.0
@@ -89,63 +132,80 @@ set(IL_NO_WDP 1)
 
 # TODO: add options for manually configuring formats (eg IL_NO_GAMES)
 
-
 # present options for the libraries which are available
-if(PNG_FOUND)
-    option(IL_NO_PNG "Disable PNG support (libpng)" 0)
-else(PNG_FOUND)
-    set(IL_NO_PNG 1)
-endif(PNG_FOUND)
-
-if(TIFF_FOUND)
-    option(IL_NO_TIF "Disable TIFF support (libtiff)" 0)
-else(TIFF_FOUND)
-    set(IL_NO_TIF 1)
-endif(TIFF_FOUND)
-
-if(JPEG_FOUND)
-    option(IL_NO_JPG "Disable JPEG support (libjpeg)" 0)
-else(JPEG_FOUND)
-    set(IL_NO_JPG 1)
-endif(JPEG_FOUND)
-
-if(OPENEXR_FOUND)
-    option(IL_NO_EXR "Disable EXR support (openEXR)" 0)
-else(OPENEXR_FOUND)
-    set(IL_NO_EXR 1)
-endif(OPENEXR_FOUND)
-
-if(JASPER_FOUND)
-    option(IL_NO_JP2 "Disable JP2 support (libjasper)" 0)
-else(JASPER_FOUND)
-    set(IL_NO_JP2 1)
-endif(JASPER_FOUND)
-
-if(MNG_FOUND)
-    option(IL_NO_MNG "Disable MNG support (libmng)" 0)
-else(MNG_FOUND)
-    set(IL_NO_MNG 1)
-endif(MNG_FOUND)
-
-if(LCMS2_FOUND)
-    option(IL_NO_LCMS "Disable LCMS support (Little CMS)" 0)
-    #TODO: be more clever about lcms include... it smells wrong.
-    option(LCMS_NODIRINCLUDE "Include lcms.h instead of lcms/lcms.h" 1)
-else(LCMS2_FOUND)
-    set(IL_NO_LCMS 1)
-endif(LCMS2_FOUND)
-
-if(NVTT_FOUND)
-    option(IL_USE_DXTC_NVIDIA "Use Nvidia Texture Tools (NVTT) for DXTC support" 1)
-else(NVTT_FOUND)
-    set(IL_USE_DXTC_NVIDIA 0)
-endif(NVTT_FOUND)
-
-if(LIBSQUISH_FOUND)
-    option(IL_USE_DXTC_SQUISH "Use libsquish for DXTC support" 1)
-else(LIBSQUISH_FOUND)
-    set(IL_USE_DXTC_SQUISH 0)
-endif(LIBSQUISH_FOUND)
+if(NOT ${IL_PNG_LIB})
+  if(${PNG_FOUND})
+      option(IL_NO_PNG "Disable PNG support (libpng)" 0)
+  else(${PNG_FOUND})
+      set(IL_NO_PNG 1)
+  endif(${PNG_FOUND})
+endif(NOT ${IL_PNG_LIB})
+
+if(NOT ${IL_TIFF_LIB})
+  if(TIFF_FOUND)
+      option(IL_NO_TIF "Disable TIFF support (libtiff)" 0)
+  else(TIFF_FOUND)
+      set(IL_NO_TIF 1)
+  endif(TIFF_FOUND)
+endif(NOT ${IL_TIFF_LIB})
+
+if(NOT ${IL_JPEG_LIB})
+  if(${JPEG_FOUND})
+      option(IL_NO_JPG "Disable JPEG support (libjpeg)" 0)
+  else(${JPEG_FOUND})
+      set(IL_NO_JPG 1)
+  endif(${JPEG_FOUND})
+endif(NOT ${IL_JPEG_LIB})
+
+if(NOT ${IL_OPENEXR_LIB})
+  if(OPENEXR_FOUND)
+      option(IL_NO_EXR "Disable EXR support (openEXR)" 0)
+  else(OPENEXR_FOUND)
+      set(IL_NO_EXR 1)
+  endif(OPENEXR_FOUND)
+endif(NOT ${IL_OPENEXR_LIB})
+
+if(NOT ${IL_JASPER_LIB})
+  if(JASPER_FOUND)
+      option(IL_NO_JP2 "Disable JP2 support (libjasper)" 0)
+  else(JASPER_FOUND)
+      set(IL_NO_JP2 1)
+  endif(JASPER_FOUND)
+endif(NOT ${IL_JASPER_LIB})
+
+if(NOT ${IL_MNG_LIB})
+  if(MNG_FOUND)
+      option(IL_NO_MNG "Disable MNG support (libmng)" 0)
+  else(MNG_FOUND)
+      set(IL_NO_MNG 1)
+  endif(MNG_FOUND)
+endif(NOT ${IL_MNG_LIB})
+
+if(NOT ${IL_LCMS2_LIB})
+  if(LCMS2_FOUND)
+      option(IL_NO_LCMS "Disable LCMS support (Little CMS)" 0)
+      #TODO: be more clever about lcms include... it smells wrong.
+      option(LCMS_NODIRINCLUDE "Include lcms.h instead of lcms/lcms.h" 1)
+  else(LCMS2_FOUND)
+      set(IL_NO_LCMS 1)
+  endif(LCMS2_FOUND)
+endif(NOT ${IL_LCMS2_LIB})
+
+if(NOT ${IL_NVTT_LIB})
+  if(NVTT_FOUND)
+      option(IL_USE_DXTC_NVIDIA "Use Nvidia Texture Tools (NVTT) for DXTC support" 1)
+  else(NVTT_FOUND)
+      set(IL_USE_DXTC_NVIDIA 0)
+  endif(NVTT_FOUND)
+endif(NOT ${IL_NVTT_LIB})
+
+if(NOT ${IL_SQUISH_LIB})
+  if(LIBSQUISH_FOUND)
+      option(IL_USE_DXTC_SQUISH "Use libsquish for DXTC support" 1)
+  else(LIBSQUISH_FOUND)
+      set(IL_USE_DXTC_SQUISH 0)
+  endif(LIBSQUISH_FOUND)
+endif(NOT ${IL_SQUISH_LIB})
 
 # Sets the output folders
 set(LIBDIR "../lib/")
@@ -164,7 +224,7 @@ if(WIN32)
 endif(WIN32)
 
 if(UNICODE)
-	MESSAGE("Compiling IL Unicode")
+	MESSAGE("DevIL, Compiling IL Unicode")
 	add_definitions(-DUNICODE -D_UNICODE)
 endif(UNICODE)
 #if(COMPILER_MSVC)
@@ -174,48 +234,48 @@ set(libs "")
 set(incs "")
 
 if(NOT IL_NO_PNG)
-    list(APPEND incs ${PNG_INCLUDE_DIRS} )
-    list(APPEND libs ${PNG_LIBRARIES} )
+  list(APPEND incs ${PNG_INCLUDE_DIRS} )
+  list(APPEND libs ${PNG_LIBRARIES} )
 endif(NOT IL_NO_PNG)
 
 if(NOT IL_NO_JPG)
-    list(APPEND incs ${JPEG_INCLUDE_DIRS} )
-    list(APPEND libs ${JPEG_LIBRARIES} )
+  list(APPEND incs ${JPEG_INCLUDE_DIRS} )
+  list(APPEND libs ${JPEG_LIBRARIES} )
 endif(NOT IL_NO_JPG)
 
 if(NOT IL_NO_TIF)
-    list(APPEND incs ${TIFF_INCLUDE_DIRS} )
-    list(APPEND libs ${TIFF_LIBRARIES} )
+  list(APPEND incs ${TIFF_INCLUDE_DIRS} )
+  list(APPEND libs ${TIFF_LIBRARIES} )
 endif(NOT IL_NO_TIF)
 
 if(NOT IL_NO_JP2)
-    list(APPEND incs ${JASPER_INCLUDE_DIR} )
-    list(APPEND libs ${JASPER_LIBRARIES} )
+  list(APPEND incs ${JASPER_INCLUDE_DIR} )
+  list(APPEND libs ${JASPER_LIBRARIES} )
 endif(NOT IL_NO_JP2)
 
 if(NOT IL_NO_MNG)
-    list(APPEND incs ${MNG_INCLUDE_DIR} )
-    list(APPEND libs ${MNG_LIBRARIES} )
+  list(APPEND incs ${MNG_INCLUDE_DIR} )
+  list(APPEND libs ${MNG_LIBRARIES} )
 endif(NOT IL_NO_MNG)
 
 if(NOT IL_NO_LCMS)
-    list(APPEND incs ${LCMS2_INCLUDE_DIRS} )
-    list(APPEND libs ${LCMS2_LIBRARIES} )
+  list(APPEND incs ${LCMS2_INCLUDE_DIRS} )
+  list(APPEND libs ${LCMS2_LIBRARIES} )
 endif(NOT IL_NO_LCMS)
 
 if(NOT IL_NO_EXR)
-    list(APPEND incs ${OPENEXR_INCLUDE_DIRS} )
-    list(APPEND libs ${OPENEXR_LIBRARIES} )
+  list(APPEND incs ${OPENEXR_INCLUDE_DIRS} )
+  list(APPEND libs ${OPENEXR_LIBRARIES} )
 endif(NOT IL_NO_EXR)
 
 if(IL_USE_DXTC_NVIDIA)
-    list(APPEND incs ${NVTT_INCLUDE_DIR} )
-    list(APPEND libs ${NVTT_LIBRARY} )
+  list(APPEND incs ${NVTT_INCLUDE_DIR} )
+  list(APPEND libs ${NVTT_LIBRARY} )
 endif(IL_USE_DXTC_NVIDIA)
 
 if(IL_USE_DXTC_NVIDIA)
-    list(APPEND incs ${NVTT_INCLUDE_DIR} )
-    list(APPEND libs ${NVTT_LIBRARY} )
+  list(APPEND incs ${NVTT_INCLUDE_DIR} )
+  list(APPEND libs ${NVTT_LIBRARY} )
 endif(IL_USE_DXTC_NVIDIA)
 
 if(IL_USE_DXTC_SQUISH)