Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -277,14 +277,15 @@ file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH)
message(STATUS "Module Path: ${CMAKE_MODULE_PATH}")
message(STATUS "Prefix Path: ${CMAKE_PREFIX_PATH}")

include(cmake/cmake_functions.cmake)

# --------------------------------------------------------
# detect qt library
# --------------------------------------------------------
if(MSVC)
if (ECAL_USE_QT)
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core QUIET)
if (NOT "${QT_FOUND}")
include("cmake/qt_msvc_path.cmake")
autodetect_qt_msvc_dir()
endif()
endif()
Expand Down Expand Up @@ -640,7 +641,6 @@ message(STATUS "ECAL_INSTALL_SAMPLE_SOURCES : ${ECAL_INS
message(STATUS "ECAL_USE_NPCAP : ${ECAL_USE_NPCAP}")
message(STATUS "ECAL_THIRDPARTY_BUILD_ASIO : ${ECAL_THIRDPARTY_BUILD_ASIO}")
message(STATUS "ECAL_THIRDPARTY_BUILD_BENCHMARK : ${ECAL_THIRDPARTY_BUILD_BENCHMARK}")
message(STATUS "ECAL_THIRDPARTY_BUILD_CMAKE_FUNCTIONS : ${ECAL_THIRDPARTY_BUILD_CMAKE_FUNCTIONS}")
message(STATUS "ECAL_THIRDPARTY_BUILD_CURL : ${ECAL_THIRDPARTY_BUILD_CURL}")
message(STATUS "ECAL_THIRDPARTY_BUILD_FINEFTP : ${ECAL_THIRDPARTY_BUILD_FINEFTP}")
message(STATUS "ECAL_THIRDPARTY_BUILD_FTXUI : ${ECAL_THIRDPARTY_BUILD_FTXUI}")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ if(WIN32)
list(APPEND file_list_include
qt/qt_windeployqt.cmake
qt/exclusive_command.cmake
qt/qt_msvc_path.cmake
)
endif()

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
# ========================= eCAL LICENSE =================================
#
# Copyright (C) 2016 - 2019 Continental Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# ========================= eCAL LICENSE =================================

function(deprecate_git_mayor_version _variable _access)
if (_access STREQUAL "READ_ACCESS")
message(WARNING "The variable ${_variable} is deprecated. Please use the variable GIT_REVISION_MAJOR instead. The old variable may be removed in future versions of cmake_functions.")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
# ========================= eCAL LICENSE =================================
#
# Copyright (C) 2016 - 2019 Continental Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# ========================= eCAL LICENSE =================================

# returns 64 or 32
macro(bit_build out)
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
# ========================= eCAL LICENSE =================================
#
# Copyright (C) 2016 - 2019 Continental Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# ========================= eCAL LICENSE =================================

cmake_minimum_required(VERSION 3.17) #CMAKE_CURRENT_FUNCTION_LIST_DIR has been added in 3.17

# Define the function to add the PowerShell script as a post-build command
Expand Down
File renamed without changes.
1 change: 0 additions & 1 deletion cmake/submodule_dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ set(ecal_submodule_dependency_provider_root_dir ${CMAKE_CURRENT_LIST_DIR})

set(ecal_submodule_dependencies
asio
CMakeFunctions
CURL
ecaludp
fineftp
Expand Down
3 changes: 0 additions & 3 deletions thirdparty/cmakefunctions/build-cmakefunctions.cmake

This file was deleted.

2 changes: 0 additions & 2 deletions thirdparty/cmakefunctions/cmake_functions/.gitignore

This file was deleted.

44 changes: 0 additions & 44 deletions thirdparty/cmakefunctions/cmake_functions/CMakeLists.txt

This file was deleted.

This file was deleted.

This file was deleted.

Loading