Commit 872a9448 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

cmake:

* Don't use dyld functions on darwin by default as they are deprecated.
* Defines HAVE_DYNAMIC_MODULES, and add an entry in the options for it.
* Fix config.h generation (was accidentaly removed).
* Fix FindDlopen.cmake
This produce a working in tree vlc AND an installable vlc at the same time.
parent 53783dce
......@@ -315,7 +315,7 @@
#cmakedefine HAVE___VA_COPY
#cmakedefine ICONV_CONST ${ICONV_CONST}
#cmakedefine INTDIV0_RAISES_SIGFPE
#cmakedefine LIBEXT
#cmakedefine LIBEXT "${LIBEXT}"
#cmakedefine NDEBUG
#cmakedefine NO_MINUS_C_MINUS_O
#cmakedefine NTOHL_IN_SYS_PARAM_H
......@@ -419,4 +419,5 @@
#cmakedefine glthread_once_call libintl_once_call
#cmakedefine glthread_once_singlethreaded libintl_once_singlethreaded
#include <vlc_fixups.h>
#endif
\ No newline at end of file
#endif
......@@ -9,12 +9,11 @@
# Redistribution and use is allowed according to the terms of the BSD license.
# Assume dlopen is not found.
if (Dlopen_SEARCHED)
if (NOT Dlopen_SEARCHED)
include(CheckLibraryExists)
set(Dlopen_SEARCHED TRUE)
set(Dlopen_FOUND FALSE)
set(Dlopen_SEARCHED TRUE CACHE INTERNAL "")
set(Dlopen_FOUND FALSE CACHE INTERNAL "")
foreach (library c c_r dl)
if (NOT Dlopen_FOUND)
......@@ -22,7 +21,7 @@ if (Dlopen_SEARCHED)
if (Dlopen_IN_${library})
set(Dlopen_LIBRARIES ${library} CACHE STRING "Library containing dlopen")
set(Dlopen_FOUND TRUE)
set(Dlopen_FOUND TRUE CACHE INTERNAL "")
endif (Dlopen_IN_${library})
endif (NOT Dlopen_FOUND)
......@@ -39,4 +38,4 @@ if (Dlopen_SEARCHED)
endif (Dlopen_FOUND)
mark_as_advanced(Dlopen_LIBRARIES)
endif(Dlopen_SEARCHED)
\ No newline at end of file
endif(NOT Dlopen_SEARCHED)
......@@ -107,7 +107,6 @@ if(APPLE)
set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS
"${CMAKE_SHARED_MODULE_CREATE_C_FLAGS} -undefined dynamic_lookup")
set(HAVE_DL_DYLD ON INTERNAL)
set(SYS_DARWIN 1)
vlc_enable_modules(macosx minimal_macosx access_eyetv quartztext)
......@@ -181,8 +180,12 @@ set(COPYRIGHT_YEARS "2001-2007")
# Options
###########################################################
OPTION( ENABLE_HTTPD "Enable httpd server" ON )
OPTION( ENABLE_VLM "Enable vlm" ON )
OPTION( ENABLE_HTTPD "Enable httpd server" ON )
OPTION( ENABLE_VLM "Enable vlm" ON )
OPTION( ENABLE_DYNAMIC_PLUGINS "Enable dynamic plugin" ON )
set( HAVE_DYNAMIC_PLUGINS ${ENABLE_DYNAMIC_PLUGINS})
set( LIBEXT ${CMAKE_SHARED_MODULE_SUFFIX})
###########################################################
# Modules: Following are all listed in options
......@@ -249,3 +252,5 @@ set(HAVE_DL_DLOPEN ${Dlopen_FOUND})
###########################################################
# Final configuration
###########################################################
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/include/config.h)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment