From d1affe74dd71618cbffcf4e787802ef4e701406c Mon Sep 17 00:00:00 2001 From: laurent-garnier <laurent.garnier@univ-rennes1.fr> Date: Fri, 29 Sep 2023 14:06:58 +0200 Subject: [PATCH] moved to meta --- .../FindLibMensiaAdvancedVisualisation.cmake | 39 ------- cmake-modules/FindOVSDK.cmake | 102 ------------------ .../FindOpenViBEPluginsGlobalDefines.cmake | 18 ---- .../FindOpenViBEVisualizationToolkit.cmake | 33 ------ cmake-modules/FindSourceDependencyJSON.cmake | 9 -- cmake-modules/FindSourceRCProperties.cmake | 10 -- cmake-modules/FindThirdPartyExpat.cmake | 70 ------------ cmake-modules/FindThirdPartyGSL.cmake | 41 ------- cmake-modules/FindThirdPartyGTK.cmake | 79 -------------- cmake-modules/FindThirdPartyX11.cmake | 43 -------- 10 files changed, 444 deletions(-) delete mode 100644 cmake-modules/FindLibMensiaAdvancedVisualisation.cmake delete mode 100755 cmake-modules/FindOVSDK.cmake delete mode 100644 cmake-modules/FindOpenViBEPluginsGlobalDefines.cmake delete mode 100644 cmake-modules/FindOpenViBEVisualizationToolkit.cmake delete mode 100644 cmake-modules/FindSourceDependencyJSON.cmake delete mode 100644 cmake-modules/FindSourceRCProperties.cmake delete mode 100644 cmake-modules/FindThirdPartyExpat.cmake delete mode 100644 cmake-modules/FindThirdPartyGSL.cmake delete mode 100644 cmake-modules/FindThirdPartyGTK.cmake delete mode 100644 cmake-modules/FindThirdPartyX11.cmake diff --git a/cmake-modules/FindLibMensiaAdvancedVisualisation.cmake b/cmake-modules/FindLibMensiaAdvancedVisualisation.cmake deleted file mode 100644 index 2851a9ed..00000000 --- a/cmake-modules/FindLibMensiaAdvancedVisualisation.cmake +++ /dev/null @@ -1,39 +0,0 @@ -# --------------------------------- -# Finds libmensia-advanced-visualization -# Adds library to target -# Adds include path -# --------------------------------- -# OPTION(DYNAMIC_LINK_LIBADVVIZ "Dynamically link libmensia-advanced-visualization" ON) - -# Default is dynamic library -IF(NOT DEFINED DYNAMIC_LINK_LIBADVVIZ) - OPTION(DYNAMIC_LINK_LIBADVVIZ "Dynamically link lib mensia-advanced-visualization" OFF) -ENDIF() - -IF(DYNAMIC_LINK_LIBADVVIZ) - ADD_DEFINITIONS(-DLMAV_Shared) - SET(LIBADVVIZ_LINKING "") -ELSE() - ADD_DEFINITIONS(-DLMAV_Static) - SET(LIBADVVIZ_LINKING -static) -ENDIF() - -SET(PATH_LIBADVVIZ "PATH_LIBADVVIZ-NOTFOUND") -SET(MENSIA_SRC_DIR ${CMAKE_SOURCE_DIR}/designer/libraries/lib-advanced-visualization/include/) -FIND_PATH(PATH_LIBADVVIZ mensia/advanced-visualization.hpp PATHS ${MENSIA_SRC_DIR} NO_DEFAULT_PATH) -IF(PATH_LIBADVVIZ) - debug_message( " Found mensia-advanced-visualization... ${PATH_LIBADVVIZ}") - IF(TARGET ${PROJECT_NAME}) - TARGET_LINK_LIBRARIES(${PROJECT_NAME} mensia-advanced-visualization${LIBADVVIZ_LINKING}) - debug_message( "Linking with mensia-advanced-visualization${LIBADVVIZ_LINKING}") - - ENDIF() - IF(TARGET ${PROJECT_NAME}-static) - TARGET_LINK_LIBRARIES(${PROJECT_NAME}-static mensia-advanced-visualization${LIBADVVIZ_LINKING}) - debug_message( "Linking with mensia-advanced-visualization${LIBADVVIZ_LINKING}") - ENDIF() - - ADD_DEFINITIONS(-DTARGET_HAS_LibAdvancedVisualization) -ELSE() - MESSAGE(WARNING " FAILED to find mensia-advanced-visualization...") -ENDIF() diff --git a/cmake-modules/FindOVSDK.cmake b/cmake-modules/FindOVSDK.cmake deleted file mode 100755 index 473c8de7..00000000 --- a/cmake-modules/FindOVSDK.cmake +++ /dev/null @@ -1,102 +0,0 @@ -# --------------------------------- -# Finds OpenViBE SDK binary distribution -# --------------------------------- - - -if(NOT CMAKE_BUILD_TYPE AND CMAKE_GENERATOR MATCHES "Visual Studio*") - set(MULTI_BUILD TRUE) -elseif(CMAKE_BUILD_TYPE AND OV_PACKAGE) - set(SOLO_PACKAGE TRUE) -elseif(CMAKE_BUILD_TYPE) - set(SOLO_BUILD TRUE) -else() - message(FATAL_ERROR "Build should specify a type or use a multi-type generator (like Visual Studio)") -endif() - -if(NOT DEFINED TRIED_FIND_OVSDK) - if(MULTI_BUILD) - set(SEEK_PATHS ${OPENVIBE_SDK_PATH};${LIST_DEPENDENCIES_PATH}) - unset(OPENVIBE_SDK_PATH CACHE) - foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} ) - # set(OPENVIBE_SDK_PATH ${OPENVIBE_SDK_PATH}/$<UPPER_CASE:$<CONFIG>>) - string( TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIGU ) - unset(OPENVIBE_SDK_PATH_TMP CACHE) - find_path(OPENVIBE_SDK_PATH_TMP include/openvibe/ov_all.h PATHS ${SEEK_PATHS} PATH_SUFFIXES openvibe-sdk-${OUTPUTCONFIG} ${OUTPUTCONFIG} NO_DEFAULT_PATH) - set(OPENVIBE_SDK_PATH_${OUTPUTCONFIGU} ${OPENVIBE_SDK_PATH_TMP}) - if(OPENVIBE_SDK_PATH_TMP) - message("Found ${OUTPUTCONFIG} of sdk at ${OPENVIBE_SDK_PATH_TMP}") - string(CONCAT OPENVIBE_SDK_PATH ${OPENVIBE_SDK_PATH} $<$<CONFIG:${OUTPUTCONFIGU}>:${OPENVIBE_SDK_PATH_TMP}>) - set(AT_LEAST_ONE_OV_BUILD TRUE) - endif() - endforeach() - if(NOT DEFINED AT_LEAST_ONE_OV_BUILD) - message(FATAL_ERROR "Did not find any valid build of OpenViBE SDK") - endif() - else() # Regular build - #string(TOLOWER ${CMAKE_BUILD_TYPE} OV_SDK_BUILD_TYPE) - #find_path(OPENVIBE_SDK_PATH include/openvibe/ov_all.h PATHS ${LIST_DEPENDENCIES_PATH} PATH_SUFFIXES openvibe-sdk-${OV_SDK_BUILD_TYPE} NO_DEFAULT_PATH) - #if(NOT OPENVIBE_SDK_PATH) - # message(FATAL_ERROR " FAILED to find OpenViBE SDK [${OPENVIBE_SDK_PATH}]") - #endif() - #string(REGEX REPLACE "\\\\+" "/" OPENVIBE_SDK_PATH ${OPENVIBE_SDK_PATH}) - #debug_message(" Found OpenViBE SDK... [${OPENVIBE_SDK_PATH}]") - endif() - set(TRIED_FIND_OVSDK TRUE) -endif() - -if(INSTALL_SDK) - if(MULTI_BUILD) # Replace with generator expression in CMake 3.5+ - foreach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES}) - string(TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIGU) - file(GLOB EXE_SCRIPT_LIST "${OPENVIBE_SDK_PATH_${OUTPUTCONFIGU}}/*.cmd" "${OPENVIBE_SDK_PATH_${OUTPUTCONFIGU}}/*.sh") - if(EXE_SCRIPT_LIST) - foreach(SCRIPT IN LISTS EXE_SCRIPT_LIST) - get_filename_component(base_name ${SCRIPT} NAME_WE) - if(WIN32) - set(exe_name "${base_name}.exe") - else() - set(exe_name ${base_name}) - endif() - IF(WIN32) - SET(SCRIPT_POSTFIX ".cmd") - ELSEIF(APPLE) - SET(SCRIPT_POSTFIX "-macos.sh") - ELSEIF(UNIX) - # Debian recommends that extensions such as .sh are not used; On Linux, scripts with such extensions shouldn't be packaged - SET(SCRIPT_POSTFIX ".sh") - ENDIF() - IF(WIN32) - SET(OV_CMD_EXECUTABLE "%OV_PATH_ROOT%/bin/${exe_name}") - ENDIF() - SET(SCRIPT_NAME ${base_name}${SCRIPT_POSTFIX}) - SET(OV_CMD_ARGS "") - SET(OV_PAUSE "") - - CONFIGURE_FILE(${OV_LAUNCHER_SOURCE_PATH}/openvibe-launcher${SCRIPT_POSTFIX}-base ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPT_NAME} @ONLY) - INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPT_NAME} DESTINATION ${DIST_ROOT}) - endforeach() - endif() - install(DIRECTORY ${OPENVIBE_SDK_PATH_${OUTPUTCONFIGU}}/include DESTINATION ${DIST_INCLUDEDIR} CONFIGURATIONS ${OUTPUTCONFIG}) - install(DIRECTORY ${OPENVIBE_SDK_PATH_${OUTPUTCONFIGU}}/bin DESTINATION ${DIST_BINDIR} CONFIGURATIONS ${OUTPUTCONFIG}) # FILES_MATCHING PATTERN "openvibe-plugins*dll") or *so* - install(DIRECTORY ${OPENVIBE_SDK_PATH_${OUTPUTCONFIGU}}/lib DESTINATION ${DIST_LIBDIR} CONFIGURATIONS ${OUTPUTCONFIG}) # FILES_MATCHING PATTERN "openvibe-plugins*dll") - # install(DIRECTORY ${OPENVIBE_SDK_PATH_${OUTPUTCONFIGU}}/etc DESTINATION ${DIST_SYSCONFDIR} CONFIGURATIONS ${OUTPUTCONFIG}) - install(DIRECTORY ${OPENVIBE_SDK_PATH_${OUTPUTCONFIGU}}/share DESTINATION ${DIST_DATADIR} CONFIGURATIONS ${OUTPUTCONFIG}) - endforeach() - else() - file(GLOB EXE_SCRIPT_LIST "${OPENVIBE_SDK_PATH}/*.cmd" "${OPENVIBE_SDK_PATH}/*.sh") - foreach(SCRIPT IN LISTS EXE_SCRIPT_LIST) - get_filename_component(base_name ${SCRIPT} NAME_WE) - if(WIN32) - set(exe_name "${base_name}.exe") - else() - set(exe_name ${base_name}) - endif() - OV_INSTALL_LAUNCH_SCRIPT(SCRIPT_PREFIX ${base_name} EXECUTABLE_NAME ${exe_name} NOPROJECT) - endforeach() - install(DIRECTORY ${OPENVIBE_SDK_PATH}/include DESTINATION ${DIST_INCLUDEDIR}) - install(DIRECTORY ${OPENVIBE_SDK_PATH}/bin DESTINATION ${DIST_BINDIR}) # FILES_MATCHING PATTERN "openvibe-plugins*dll") or *so* - install(DIRECTORY ${OPENVIBE_SDK_PATH}/lib DESTINATION ${DIST_LIBDIR}) # FILES_MATCHING PATTERN "openvibe-plugins*dll") - # install(DIRECTORY ${OPENVIBE_SDK_PATH}/etc DESTINATION ${DIST_SYSCONFDIR}) - install(DIRECTORY ${OPENVIBE_SDK_PATH}/share DESTINATION ${DIST_DATADIR}) - endif() -endif() \ No newline at end of file diff --git a/cmake-modules/FindOpenViBEPluginsGlobalDefines.cmake b/cmake-modules/FindOpenViBEPluginsGlobalDefines.cmake deleted file mode 100644 index 97d83f39..00000000 --- a/cmake-modules/FindOpenViBEPluginsGlobalDefines.cmake +++ /dev/null @@ -1,18 +0,0 @@ -# --------------------------------- -# Finds OpenViBEPluginsGlobalDefines -# Adds library to target -# Adds include path -# -# @deprecated Running FindOpenVibeCommon.cmake is sufficient -# -# --------------------------------- -SET(PATH_OpenViBEPluginsGlobalDefines "PATH_OpenViBEPluginsGlobalDefines-NOTFOUND") -FIND_PATH(PATH_OpenViBEPluginsGlobalDefines ovp_global_defines.h PATHS ${OV_BASE_DIR}/common/include NO_DEFAULT_PATH) -IF(PATH_OpenViBEPluginsGlobalDefines) - debug_message( " Found OpenViBE plugins global defines...") - INCLUDE_DIRECTORIES(${PATH_OpenViBEPluginsGlobalDefines}) - - ADD_DEFINITIONS(-DTARGET_HAS_ThirdPartyOpenViBEPluginsGlobalDefines) -ELSE(PATH_OpenViBEPluginsGlobalDefines) - MESSAGE(WARNING " FAILED to find OpenViBE plugins global defines") -ENDIF(PATH_OpenViBEPluginsGlobalDefines) diff --git a/cmake-modules/FindOpenViBEVisualizationToolkit.cmake b/cmake-modules/FindOpenViBEVisualizationToolkit.cmake deleted file mode 100644 index 69f16340..00000000 --- a/cmake-modules/FindOpenViBEVisualizationToolkit.cmake +++ /dev/null @@ -1,33 +0,0 @@ -# --------------------------------- -# Finds openvibe-toolkit -# Adds library to target -# Adds include path -# --------------------------------- -option(LINK_OPENVIBE_VISUALIZATION_TOOLKIT "By default, link openvibe-visualization-toolkit, otherwise only use the includes" ON) -option(DYNAMIC_LINK_OPENVIBE_VISUALIZATION_TOOLKIT "Dynamically link openvibe-visualization-toolkit" ON) - -if(DYNAMIC_LINK_OPENVIBE_VISUALIZATION_TOOLKIT) - set(OPENVIBE_VISUALIZATION_TOOLKIT_LINKING "") - add_definitions(-DOVVIZ_Shared) -else() - set(OPENVIBE_VISUALIZATION_TOOLKIT_LINKING "-static") - add_definitions(-DOVVIZ_Static) -endif() - -set(SRC_DIR ${OV_BASE_DIR}/visualization-toolkit/include) - -set(PATH_OPENVIBE_VISUALIZATION_TOOLKIT "PATH_OPENVIBE_VISUALIZATION_TOOLKIT-NOTFOUND") -find_path(PATH_OPENVIBE_VISUALIZATION_TOOLKIT visualization-toolkit/ovviz_all.h PATHS ${SRC_DIR} NO_DEFAULT_PATH) -if(PATH_OPENVIBE_VISUALIZATION_TOOLKIT) - debug_message( " Found openvibe-toolkit... ${PATH_OPENVIBE_VISUALIZATION_TOOLKIT}") - include_directories(${PATH_OPENVIBE_VISUALIZATION_TOOLKIT}/) - - if(LINK_OPENVIBE_VISUALIZATION_TOOLKIT) - target_link_libraries(${PROJECT_NAME} openvibe-visualization-toolkit${OPENVIBE_VISUALIZATION_TOOLKIT_LINKING}) - endif() - - add_definitions(-DTARGET_HAS_OpenViBEVisualizationToolkit) -else() - message(WARNING " FAILED to find openvibe-visualization-toolkit...") -endif() - diff --git a/cmake-modules/FindSourceDependencyJSON.cmake b/cmake-modules/FindSourceDependencyJSON.cmake deleted file mode 100644 index 5114311f..00000000 --- a/cmake-modules/FindSourceDependencyJSON.cmake +++ /dev/null @@ -1,9 +0,0 @@ -# --------------------------------- -# Finds JSON sources -# Sets json_source_files -# Adds appropriate include dir -# --------------------------------- - -FILE(GLOB_RECURSE json_source_files ${OV_SOURCE_DEPENDENCIES_PATH}/json/*.cpp ${OV_SOURCE_DEPENDENCIES_PATH}/json/*.c ${OV_SOURCE_DEPENDENCIES_PATH}/json/*.h) -INCLUDE_DIRECTORIES("${OV_SOURCE_DEPENDENCIES_PATH}") -SET(SRC_FILES "${SRC_FILES};${json_source_files}") diff --git a/cmake-modules/FindSourceRCProperties.cmake b/cmake-modules/FindSourceRCProperties.cmake deleted file mode 100644 index 2383530d..00000000 --- a/cmake-modules/FindSourceRCProperties.cmake +++ /dev/null @@ -1,10 +0,0 @@ -# --------------------------------- -# Configure RC file -# Sets SRC_FILES to add the path to the newly created rc file -# Adds appropriate include dir -# --------------------------------- -IF(WIN32) - OV_CONFIGURE_RC(NAME ${PROJECT_NAME}) - SET(SRC_FILES "${SRC_FILES};${CMAKE_BINARY_DIR}/resource-files/${PROJECT_NAME}.rc") -ENDIF() - diff --git a/cmake-modules/FindThirdPartyExpat.cmake b/cmake-modules/FindThirdPartyExpat.cmake deleted file mode 100644 index 72267da2..00000000 --- a/cmake-modules/FindThirdPartyExpat.cmake +++ /dev/null @@ -1,70 +0,0 @@ -# --------------------------------- -# Finds EXPAT toolkit -# -# Sets EXPAT_FOUND -# Sets EXPAT_LIBRARIES -# Sets EXPAT_LIBRARY_DIRS -# Sets EXPAT_LDFLAGS -# Sets EXPAT_LDFLAGS_OTHERS -# Sets EXPAT_INCLUDE_DIRS -# Sets EXPAT_CFLAGS -# Sets EXPAT_CFLAGS_OTHERS -# --------------------------------- -IF(UNIX) - SET(EXPAT_expat_INCLUDE_PATH "EXPAT_expat_INCLUDE_PATH-NOTFOUND") - FIND_PATH(EXPAT_expat_INCLUDE_PATH "include/expat.h" - PATHS "${LIST_DEPENDENCIES_PATH}") - FIND_LIBRARY(EXPAT_expat_LIBRARY - NAMES lib/expat - PATHS "${LIST_DEPENDENCIES_PATH}") -ENDIF(UNIX) - -IF(WIN32) - SET(EXPAT_expat_INCLUDE_PATH "EXPAT_expat_INCLUDE_PATH-NOTFOUND") - FIND_PATH(EXPAT_expat_INCLUDE_PATH "expat/Source/libexpat.h" - PATHS "${LIST_DEPENDENCIES_PATH}") - FIND_LIBRARY(EXPAT_expat_LIBRARY - NAMES libexpat - PATHS ${LIST_DEPENDENCIES_PATH} PATH_SUFFIXES "expat/Libs" "expat/Bin") -ENDIF(WIN32) - -IF(EXPAT_expat_INCLUDE_PATH) -IF(EXPAT_expat_LIBRARY) - SET(EXPAT_FOUND TRUE) - SET(EXPAT_LIBRARIES ${EXPAT_expat_LIBRARY}) - SET(EXPAT_LIBRARY_DIRS "") - SET(EXPAT_LDFLAGS "") - SET(EXPAT_LDFLAGS_OTHERS "") - SET(EXPAT_INCLUDE_DIRS ${EXPAT_expat_INCLUDE_PATH}) - SET(EXPAT_CFLAGS "") - SET(EXPAT_CFLAGS_OTHERS "") -ENDIF(EXPAT_expat_LIBRARY) -ENDIF(EXPAT_expat_INCLUDE_PATH) - -MARK_AS_ADVANCED( - EXPAT_expat_INCLUDE_PATH - EXPAT_expat_LIBRARY - - EXPAT_FOUND - EXPAT_LIBRARIES - EXPAT_LIBRARY_DIRS - EXPAT_LDFLAGS - EXPAT_LDFLAGS_OTHERS - EXPAT_INCLUDE_DIRS - EXPAT_CFLAGS - EXPAT_CFLAGS_OTHERS -) - -IF(EXPAT_FOUND) - debug_message( " Found expat...") - INCLUDE_DIRECTORIES(${EXPAT_INCLUDE_DIRS}) - ADD_DEFINITIONS(${EXPAT_CFLAGS}) - ADD_DEFINITIONS(${EXPAT_CFLAGS_OTHERS}) - # LINK_DIRECTORIES(${EXPAT_LIBRARY_DIRS}) - TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${EXPAT_LIBRARIES}) - - ADD_DEFINITIONS(-DTARGET_HAS_ThirdPartyExpat) -ELSE(EXPAT_FOUND) - MESSAGE(WARNING " FAILED to find expat...") -ENDIF(EXPAT_FOUND) - diff --git a/cmake-modules/FindThirdPartyGSL.cmake b/cmake-modules/FindThirdPartyGSL.cmake deleted file mode 100644 index bad2046f..00000000 --- a/cmake-modules/FindThirdPartyGSL.cmake +++ /dev/null @@ -1,41 +0,0 @@ -# --------------------------------- -# Finds GSL toolkit -# -# Sets GSL_FOUND -# Sets GSL_LIBRARIES -# Sets GSL_LIBRARY_DIRS -# Sets GSL_LDFLAGS -# Sets GSL_LDFLAGS_OTHERS -# Sets GSL_INCLUDE_DIRS -# Sets GSL_CFLAGS -# Sets GSL_CFLAGS_OTHERS -# -# Adds library to target -# Adds include path -# --------------------------------- - -INCLUDE("FindThirdPartyPkgConfig") -pkg_check_modules(GSL gsl) - -IF(GSL_FOUND) - debug_message(" Found gsl...") - INCLUDE_DIRECTORIES(${GSL_INCLUDE_DIRS}) - ADD_DEFINITIONS(${GSL_CFLAGS}) - ADD_DEFINITIONS(${GSL_CFLAGS_OTHERS}) - # LINK_DIRECTORIES(${GSL_LIBRARY_DIRS}) - FOREACH(GSL_LIB ${GSL_LIBRARIES}) - SET(GSL_LIB1 "GSL_LIB1-NOTFOUND") - FIND_LIBRARY(GSL_LIB1 NAMES ${GSL_LIB} PATHS ${GSL_LIBRARY_DIRS} ${GSL_LIBDIR} NO_DEFAULT_PATH) - FIND_LIBRARY(GSL_LIB1 NAMES ${GSL_LIB}) - IF(GSL_LIB1) - debug_message(" [ OK ] Third party lib ${GSL_LIB1}") - TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${GSL_LIB1}) - ELSE(GSL_LIB1) - MESSAGE(WARNING " [FAILED] Third party lib ${GSL_LIB}") - ENDIF(GSL_LIB1) - ENDFOREACH(GSL_LIB) - - ADD_DEFINITIONS(-DTARGET_HAS_ThirdPartyGSL) -ELSE(GSL_FOUND) - MESSAGE(WARNING " FAILED to find gsl...") -ENDIF(GSL_FOUND) diff --git a/cmake-modules/FindThirdPartyGTK.cmake b/cmake-modules/FindThirdPartyGTK.cmake deleted file mode 100644 index 84b10a70..00000000 --- a/cmake-modules/FindThirdPartyGTK.cmake +++ /dev/null @@ -1,79 +0,0 @@ -# --------------------------------- -# Finds GTK toolkit -# -# Sets GTK_FOUND -# Sets GTK_LIBRARIES -# Sets GTK_LIBRARY_DIRS -# Sets GTK_LDFLAGS -# Sets GTK_LDFLAGS_OTHERS -# Sets GTK_INCLUDE_DIRS -# Sets GTK_CFLAGS -# Sets GTK_CFLAGS_OTHERS -# --------------------------------- - -INCLUDE("FindPkgConfig") - -IF(WIN32) - pkg_check_modules(GTK gtk+-win32-2.0 gthread-2.0) -ELSE(WIN32) - pkg_check_modules(GTK "gtk+-2.0" "gthread-2.0") -ENDIF(WIN32) - -IF(${BUILD_ARCH} STREQUAL "x64") - SET(GTK_LIB_SUBFOLDER "i686-pc-vs10") - SET(LIB_Z_NAME "zlib1") -ELSE() - SET(GTK_LIB_SUBFOLDER "2.10.0") - SET(LIB_Z_NAME "zdll") -ENDIF() -IF(GTK_FOUND) - debug_message( " Found GTK+...") - # This is a bit convoluted way of finding zlib (because GTK_INCLUDE_DIRS - # is actually a list of folders, not a single one) - find_path(PATH_ZLIB gtk/include/zlib.h PATHS ${LIST_DEPENDENCIES_PATH} NO_DEFAULT_PATH) - INCLUDE_DIRECTORIES(${GTK_INCLUDE_DIRS} ${GTHREAD_INCLUDE_DIRS} "${PATH_ZLIB}/gtk/include") - #shouldn't add GTK_CFLAGS, this results in AdditionalIncludeDirectories becoming broken in visual studio - #ADD_DEFINITIONS(${GTK_CFLAGS} ${GTK_CFLAGS_OTHERS} ${GTHREAD_CFLAGS}${GTHREAD_CFLAGS_OTHERS}) - #LINK_DIRECTORIES(${GTK_LIBRARY_DIRS} ${GTHREAD_LIBRARY_DIRS}) - IF(WIN32) - SET( GTK_LIB_LIST ${GTK_LIBRARIES} ${GTHREAD_LIBRARIES} ${LIB_Z_NAME}) - ELSE(WIN32) - SET( GTK_LIB_LIST ${GTK_LIBRARIES} ${GTHREAD_LIBRARIES} z) - ENDIF(WIN32) - - IF(WIN32) - # gdi32.lib could be under the MS Windows SDK - INCLUDE("OvSetWindowsSDKPath") - INSTALL( - DIRECTORY ${GTK_LIBRARY_DIRS}/../bin/ - DESTINATION ${DIST_BINDIR} - FILES_MATCHING PATTERN "*.dll") - INSTALL( - DIRECTORY ${GTK_LIBRARY_DIRS}/gtk-2.0/${GTK_LIB_SUBFOLDER}/engines/ - DESTINATION ${DIST_LIBDIR}/gtk-2.0/${GTK_LIB_SUBFOLDER}/engines/ - FILES_MATCHING PATTERN "*.dll") - INSTALL( - FILES ${GTK_LIBRARY_DIRS}/..//etc/gtk-2.0/gtkrc - DESTINATION ${DIST_SYSCONFDIR}/gtk-2.0/) - ENDIF() - - FOREACH(GTK_LIB ${GTK_LIB_LIST}) - SET(GTK_LIB1 "GTK_LIB1-NOTFOUND") - FIND_LIBRARY(GTK_LIB1 NAMES ${GTK_LIB} PATHS ${GTK_LIBRARY_DIRS} ${GTK_LIBDIR} NO_DEFAULT_PATH) - FIND_LIBRARY(GTK_LIB1 NAMES ${GTK_LIB} PATHS ${GTK_LIBRARY_DIRS} ${GTK_LIBDIR}) - IF(WIN32) - FIND_LIBRARY(GTK_LIB1 NAMES ${GTK_LIB} PATHS ${OV_MS_SDK_PATH}/lib) - ENDIF(WIN32) - IF(GTK_LIB1) - debug_message( " [ OK ] Third party lib ${GTK_LIB1}") - TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${GTK_LIB1}) - ELSE(GTK_LIB1) - MESSAGE(WARNING " [FAILED] Third party lib ${GTK_LIB}") - ENDIF(GTK_LIB1) - ENDFOREACH(GTK_LIB) -ELSE(GTK_FOUND) - MESSAGE(WARNING " FAILED to find GTK+...") - IF(NOT PKG_CONFIG_FOUND) - MESSAGE(WARNING " Did not even find pkg-config exe") - ENDIF(NOT PKG_CONFIG_FOUND) -ENDIF(GTK_FOUND) diff --git a/cmake-modules/FindThirdPartyX11.cmake b/cmake-modules/FindThirdPartyX11.cmake deleted file mode 100644 index efc73467..00000000 --- a/cmake-modules/FindThirdPartyX11.cmake +++ /dev/null @@ -1,43 +0,0 @@ -# --------------------------------- -# Finds X11 toolkit -# -# Sets X11_FOUND -# Sets X11_LIBRARIES -# Sets X11_LIBRARY_DIRS -# Sets X11_LDFLAGS -# Sets X11_LDFLAGS_OTHERS -# Sets X11_INCLUDE_DIRS -# Sets X11_CFLAGS -# Sets X11_CFLAGS_OTHERS -# --------------------------------- -IF(UNIX) - SET(OLD_CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}) - IF(APPLE) - SET(CMAKE_PREFIX_PATH "/opt/X11") - ENDIF() - INCLUDE("FindPkgConfig") - pkg_check_modules(X11 x11) - - IF(X11_FOUND) - debug_message( " Found X11... ${X11_INCLUDE_DIRS}") - INCLUDE_DIRECTORIES(${X11_INCLUDE_DIRS}) - ADD_DEFINITIONS(${X11_CFLAGS}) - ADD_DEFINITIONS(${X11_CFLAGS_OTHERS}) - # LINK_DIRECTORIES(${X11_LIBRARY_DIRS}) - FOREACH(X11_LIB ${X11_LIBRARIES}) - SET(X11_LIB1 "X11_LIB1-NOTFOUND") - FIND_LIBRARY(X11_LIB1 NAMES ${X11_LIB} PATHS ${X11_LIBRARY_DIRS} ${X11_LIBDIR} NO_DEFAULT_PATH) - FIND_LIBRARY(X11_LIB1 NAMES ${X11_LIB}) - IF(X11_LIB1) - debug_message( " [ OK ] Third party lib ${X11_LIB1}") - TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${X11_LIB1}) - ELSE(X11_LIB1) - MESSAGE(WARNING " [FAILED] Third party lib ${X11_LIB}") - ENDIF(X11_LIB1) - ENDFOREACH(X11_LIB) - ELSE(X11_FOUND) - MESSAGE(WARNING " FAILED to find X11...") - ENDIF(X11_FOUND) - - SET(CMAKE_PREFIX_PATH ${OLD_CMAKE_PREFIX_PATH}) -ENDIF(UNIX) -- GitLab