Changeset 95932c1566de36c6fbcee2ee1f4db6d5a476a2b0

Timestamp:

02/25/08 23:15:52 (7 months ago)

Author:

Faustino Osuna <riquedafreak@videolan.org>

git-committer:

Faustino Osuna <riquedafreak@videolan.org> 1203977752 +0000

git-parent:

[ac2e4b777eefca1556904e35541cebd4287cf370]

git-author:

Faustino Osuna <riquedafreak@videolan.org> 1203977752 +0000

Message:

cmake: Code clean up, set up options before we start including custom macros, add CONTRIB_INCLDE to CMAKE_REQUIRED_INCLUDES if ENABLE_CONTRIB is set, and correctly discover postproc/postprocess.h header by temporarily adding FFmpeg_CFLAGS to CMAKE_REQUIRED_FLAGS before checking for the header.

Files:

• extras/buildsystem/cmake/include/config.cmake (modified) (13 diffs)

extras/buildsystem/cmake/include/config.cmake

@@ +1 @@
+###########################################################
+# System Includes
+###########################################################
-include( CheckIncludeFile )
-include (CheckTypeSize)
@@ -5 +8 @@
-include (CheckLibraryExists)
-
+###########################################################
+# Options
+###########################################################
+# Options moved before the custom macro includes because those macros need path values, if the ENABLE_CONTRIB
+# has been set.
+
+OPTION( ENABLE_HTTPD           "Enable httpd server" ON )
+OPTION( ENABLE_VLM             "Enable vlm" ON )
+OPTION( ENABLE_DYNAMIC_PLUGINS "Enable dynamic plugin" ON )
+OPTION( UPDATE_CHECK           "Enable automatic new version checking" OFF )
+OPTION( ENABLE_NO_SYMBOL_CHECK "Don't check symbols of modules against libvlc. (Enabling this option speeds up compilation)" OFF )
+OPTION( ENABLE_CONTRIB         "Attempt to use VLC contrib system to get the third-party libraries" ON )
+
+if(ENABLE_CONTRIB)
+
+  set( CONTRIB_INCLUDE ${CMAKE_SOURCE_DIR}/extras/contrib/include)
+  set( CONTRIB_LIB ${CMAKE_SOURCE_DIR}/extras/contrib/lib)
+  set( CONTRIB_PROGRAM ${CMAKE_SOURCE_DIR}/extras/contrib/bin)
+  set( CMAKE_LIBRARY_PATH ${CONTRIB_LIB} ${CMAKE_LIBRARY_PATH} )
+  set( CMAKE_PROGRAM_PATH ${CONTRIB_PROGRAM} ${CMAKE_PROGRAM_PATH} )
+  set( CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -L${CONTRIB_LIB}" )
+  set( CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -L${CONTRIB_LIB}" )
+  set( CMAKE_SHARED_MODULE_CREATE_C_FLAGS "${CMAKE_SHARED_MODULE_CREATE_C_FLAGS} -L${CONTRIB_LIB}" )
+  set( CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS "${CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS} -L${CONTRIB_LIB}" )
+  set( CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS} -L${CONTRIB_LIB}" )
+  set( CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -L${CONTRIB_LIB}" )
+
+  # include extras/contrib/include in the header search pathes
+  include_directories(${CONTRIB_INCLUDE})
+  set( CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${CONTRIB_INCLUDE} )
+  
+  # include the extras/contrib/bin to the search path, otherwise, when finding programs it will automatically
+  # default to system applications (e.g. we should favor the extras/contrib/bin/pkg-config over the system defined
+  # one).
+  if(WIN32)
+    set( ENV{PATH} "${CONTRIB_PROGRAM};$ENV{PATH}" )
+  else(WIN32)
+    set( ENV{PATH} "${CONTRIB_PROGRAM}:$ENV{PATH}" )
+  endif(WIN32)
+endif(ENABLE_CONTRIB)
+
+###########################################################
+# Custom Macro Includes
+###########################################################
+
-include( ${CMAKE_SOURCE_DIR}/cmake/vlc_check_include_files.cmake )
-include( ${CMAKE_SOURCE_DIR}/cmake/vlc_check_functions_exist.cmake )
@@ -12 +60 @@
-
-###########################################################
-ERSION
+ersioning
-###########################################################
-
@@ -33 +81 @@
-
-###########################################################
-
-
-
-
-
-
-
-
+
+
-
-IF (NOT CMAKE_BUILD_TYPE)
@@ -84 +126 @@
-# Functions/structures checks
-###########################################################
+
-set(CMAKE_REQUIRED_LIBRARIES c)
-set(CMAKE_EXTRA_INCLUDE_FILES string.h)
@@ -202 +245 @@
-# Other check
-###########################################################
+
-include( ${CMAKE_SOURCE_DIR}/cmake/vlc_test_inline.cmake )
-
@@ -207 +251 @@
-# Platform check
-###########################################################
+
-if(APPLE)
-    include( ${CMAKE_SOURCE_DIR}/cmake/vlc_find_frameworks.cmake )
@@ -320 +365 @@
-set( VLC_COMPILER "${CMAKE_C_COMPILER}" )
-
-
-###########################################################
-# Modules: Following are all listed in options
@@ -370 +414 @@
-# libraries
-###########################################################
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-#fixme: use find_package(cddb 0.9.5)
@@ -418 +447 @@
-find_package(FFmpeg)
-if(FFmpeg_FOUND)
+  set( CMAKE_REQUIRED_FLAGS_saved ${CMAKE_REQUIRED_FLAGS} )
+  set( CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${FFmpeg_CFLAGS}" )
+  
+  #set( CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${CONTRIB_INCLUDE}/ffmpeg )
+  
-  vlc_check_include_files (ffmpeg/avcodec.h)
-  vlc_check_include_files (ffmpeg/avutil.h)
@@ -425 +459 @@
-  vlc_add_module_compile_flag(ffmpeg ${FFmpeg_CFLAGS} )
-  vlc_module_add_link_libraries(ffmpeg ${FFmpeg_LIBRARIES})
+  
+  set( CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS_saved} )
+  set( CMAKE_REQUIRED_FLAGS_saved )
-endif(FFmpeg_FOUND)
-
@@ -530 +567 @@
-if(Dvbpsi_FOUND)
-  vlc_enable_modules(ts)
-  set(CMAKE_REQUIRED_INCLUDES ${CONTRIB_INCLUDE})
-  check_include_files ("stdint.h;dvbpsi/dvbpsi.h;dvbpsi/demux.h;dvbpsi/descriptor.h;dvbpsi/pat.h;dvbpsi/pmt.h;dvbpsi/sdt.h;dvbpsi/dr.h" HAVE_DVBPSI_DR_H)
-  vlc_module_add_link_libraries(ts ${Dvbpsi_LIBRARIES})
-endif(Dvbpsi_FOUND)
-
-
-
-set(CMAKE_REQUIRED_INCLUDES)
-
@@ -542 +576 @@
-# Final configuration
-###########################################################
+
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/include/config.h)