diff --git a/sources/jvxLibraries/third_party/git/orc/CMakeLists.txt b/sources/jvxLibraries/third_party/git/orc/CMakeLists.txt index dbae7a33..410eaf8d 100644 --- a/sources/jvxLibraries/third_party/git/orc/CMakeLists.txt +++ b/sources/jvxLibraries/third_party/git/orc/CMakeLists.txt @@ -34,16 +34,21 @@ if(${JVX_OS} MATCHES "windows") elseif(${JVX_OS} MATCHES "linux") - if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/orc) - message("orc sub project not available. Starting script to download it.") - execute_process(COMMAND ${mysh} -c "cd ${CMAKE_CURRENT_SOURCE_DIR} ; ./prepareModules-glnx.sh; exit") - message("orc installation complete.") + set(targetfolder orc) + set(archtoken glnx) + + if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${targetfolder}/${archtoken}") + message("orc sub project not available. Starting script to download it.") + execute_process(COMMAND ${mysh} -c "cd ${CMAKE_CURRENT_SOURCE_DIR} ; ./prepareModules-glnx.sh ${CMAKE_CURRENT_SOURCE_DIR}/${targetfolder}/${archtoken}; exit") + message("orc installation complete.") endif() - set(PROJECT_NAME orc) - include(${JVX_CMAKE_DIR}/common_local_lib_head.cmake) - set(ORC_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/orc/install/include/orc-0.4" CACHE INTERNAL "orc include directory") - set(ORC_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/orc/install/lib/x86_64-linux-gnu/liborc-0.4.a" CACHE INTERNAL "orc libraries") - set(ORCC "${CMAKE_SOURCE_DIR}/sources/jvxLibraries/third_party/git/orc/orc/install/bin/orcc" CACHE INTERNAL "orc compiler") +# set(PROJECT_NAME orc) +# include(${JVX_CMAKE_DIR}/common_local_lib_head.cmake) + set(ORC_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/orc/glnx/include/orc-0.4" CACHE INTERNAL "orc include directory") + set(ORC_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/orc/glnx/lib/x86_64-linux-gnu/liborc-0.4.a" CACHE INTERNAL "orc libraries") + set(ORCC "${CMAKE_SOURCE_DIR}/sources/jvxLibraries/third_party/git/orc/orc/glnx/bin/orcc" CACHE INTERNAL "orc compiler") endif() +## message(FATAL_ERROR "Hier") + diff --git a/sources/jvxLibraries/third_party/git/orc/prepareModules-glnx.sh b/sources/jvxLibraries/third_party/git/orc/prepareModules-glnx.sh old mode 100644 new mode 100755 index 19ce34f4..15b4fd05 --- a/sources/jvxLibraries/third_party/git/orc/prepareModules-glnx.sh +++ b/sources/jvxLibraries/third_party/git/orc/prepareModules-glnx.sh @@ -4,8 +4,14 @@ if [ ! -d "orc" ]; then git clone https://github.com/GStreamer/orc pushd . cd orc - meson setup build -Ddefault_library=static --prefix=`pwd`/install + + meson setup build -Ddefault_library=static --prefix=$1 + echo meson setup build -Ddefault_library=static --prefix=$1 + cd build - meson compile + + meson install + echo meson install + popd fi