diff --git a/CMakeLists.txt b/CMakeLists.txt index 77f31bfb..e6471c74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,10 @@ cmake_minimum_required (VERSION 3.7) # common solution for multiple independent projects project (sView) -set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/adm/cmake" ${CMAKE_MODULE_PATH}) +# we use include(adm/cmake/Find*.cmake) explicitly instead of find_package() +# to distinguish normal configuration files from custom search scripts +#set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/adm/cmake" ${CMAKE_MODULE_PATH}) + set (APP_VERSION_MAJOR 1) set (APP_VERSION_MINOR 0) @@ -109,7 +112,7 @@ if (USE_UPDATER) add_definitions(-DST_UPDATES_CHECK) endif() -find_package (freetype REQUIRED) +include (adm/cmake/FindFreetype.cmake) if (NOT FREETYPE_FOUND) message (FATAL_ERROR "could not find FreeType, please set FREETYPE_DIR variable" ) else() @@ -117,7 +120,7 @@ else() message (STATUS "FREETYPE_LIBRARY_DIR=${FREETYPE_LIBRARY_DIR}") endif() -find_package (FFmpeg REQUIRED) +include (adm/cmake/FindFFmpeg.cmake) if (NOT FFMPEG_FOUND) message (FATAL_ERROR "could not find FFmpeg, please set FFMPEG_DIR variable" ) else() @@ -125,7 +128,7 @@ else() message (STATUS "FFMPEG_LIBRARY_DIR=${FFMPEG_LIBRARY_DIR}") endif() -find_package (OpenAL REQUIRED) +include (adm/cmake/FindOpenAL.cmake) if (NOT OPENAL_FOUND) message (FATAL_ERROR "could not find OpenAL, please set OPENAL_DIR variable" ) else() @@ -135,7 +138,7 @@ endif() if (USE_OPENVR) add_definitions(-DST_HAVE_OPENVR) - find_package (OpenVR REQUIRED) + include (adm/cmake/FindOpenVR.cmake) if (NOT OPENVR_FOUND) message (FATAL_ERROR "could not find OpenVR, please set OPENVR_DIR variable" ) else() @@ -146,7 +149,7 @@ endif() if (WIN32) if (USE_FREEIMAGE) - find_package (FreeImage REQUIRED) + include (adm/cmake/FindFreeImage.cmake) if (NOT FREEIMAGE_FOUND) message (FATAL_ERROR "could not find FreeImage, please set FREEIMAGE_DIR variable" ) else() @@ -155,7 +158,7 @@ if (WIN32) endif() if (USE_DEVIL) - find_package (DevIL REQUIRED) + include (adm/cmake/FindDevIL.cmake) if (NOT DEVIL_FOUND) message (FATAL_ERROR "could not find DevIL, please set DEVIL_DIR variable" ) else() @@ -163,7 +166,7 @@ if (WIN32) endif() endif() - find_package (NVAPI REQUIRED) + include (adm/cmake/FindNVAPI.cmake) if (NOT NVAPI_FOUND) message (FATAL_ERROR "could not find NVAPI, please set NVAPI_DIR variable" ) else() @@ -172,7 +175,7 @@ if (WIN32) endif() if (USE_MSVCR) - find_package (MSVCR REQUIRED) + include (adm/cmake/FindMSVCR.cmake) if (NOT MSVCR_FOUND) message (FATAL_ERROR "could not find MSVCR, please set MSCVR_DIR variable" ) else() @@ -298,7 +301,7 @@ add_subdirectory(sview) # CAD Viewer # find Open CASCADE Technology -#find_package (OpenCASCADE REQUIRED) +#include (adm/cmake/FindOpenCASCADE.cmake) #if (NOT OpenCASCADE_FOUND) # message (FATAL_ERROR "could not find OpenCASCADE, please set OpenCASCADE_DIR variable" ) #else()