##// END OF EJS Templates
Updated CatalogueAPI to latest version...
jeandet -
r1335:58876cb03a16
parent child
Show More
@@ -1,61 +1,62
1 cmake_minimum_required(VERSION 3.6)
1 cmake_minimum_required(VERSION 3.6)
2 project(SciQLOP CXX)
2 project(SciQLOP CXX)
3
3
4 include(GNUInstallDirs)
4 include(GNUInstallDirs)
5
5
6 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/cmake")
6 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/cmake")
7
7
8 OPTION (CPPCHECK "Analyzes the source code with cppcheck" OFF)
8 OPTION (CPPCHECK "Analyzes the source code with cppcheck" OFF)
9 OPTION (CLANG_TIDY "Analyzes the source code with Clang Tidy" OFF)
9 OPTION (CLANG_TIDY "Analyzes the source code with Clang Tidy" OFF)
10 OPTION (IWYU "Analyzes the source code with Include What You Use" OFF)
10 OPTION (IWYU "Analyzes the source code with Include What You Use" OFF)
11
11
12 set(CMAKE_CXX_STANDARD 14)
12 set(CMAKE_CXX_STANDARD 14)
13
13
14 set(CMAKE_AUTOMOC ON)
14 set(CMAKE_AUTOMOC ON)
15 #https://gitlab.kitware.com/cmake/cmake/issues/15227
15 #https://gitlab.kitware.com/cmake/cmake/issues/15227
16 #set(CMAKE_AUTOUIC ON)
16 #set(CMAKE_AUTOUIC ON)
17 if(POLICY CMP0071)
17 if(POLICY CMP0071)
18 cmake_policy(SET CMP0071 OLD)
18 cmake_policy(SET CMP0071 OLD)
19 endif()
19 endif()
20 set(CMAKE_AUTORCC ON)
20 set(CMAKE_AUTORCC ON)
21 set(CMAKE_INCLUDE_CURRENT_DIR ON)
21 set(CMAKE_INCLUDE_CURRENT_DIR ON)
22
22
23 if(NOT DEFINED CMAKE_INSTALL_RPATH_USE_LINK_PATH)
23 if(NOT DEFINED CMAKE_INSTALL_RPATH_USE_LINK_PATH)
24 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
24 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
25 endif()
25 endif()
26 if(NOT DEFINED CMAKE_MACOSX_RPATH)
26 if(NOT DEFINED CMAKE_MACOSX_RPATH)
27 set(CMAKE_MACOSX_RPATH TRUE)
27 set(CMAKE_MACOSX_RPATH TRUE)
28 endif()
28 endif()
29
29
30 if(NOT CMAKE_BUILD_TYPE)
30 if(NOT CMAKE_BUILD_TYPE)
31 set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
31 set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
32 endif()
32 endif()
33
33
34 find_package(Qt5 COMPONENTS Core Widgets Network PrintSupport Svg Test REQUIRED)
34 find_package(Qt5 COMPONENTS Core Widgets Network PrintSupport Svg Test REQUIRED)
35
35
36 IF(CPPCHECK)
36 IF(CPPCHECK)
37 set(CMAKE_CXX_CPPCHECK "cppcheck;--enable=warning,style")
37 set(CMAKE_CXX_CPPCHECK "cppcheck;--enable=warning,style")
38 ENDIF(CPPCHECK)
38 ENDIF(CPPCHECK)
39
39
40 IF(CLANG_TIDY)
40 IF(CLANG_TIDY)
41 set(CMAKE_CXX_CLANG_TIDY "clang-tidy;-style=file;-checks=*")
41 set(CMAKE_CXX_CLANG_TIDY "clang-tidy;-style=file;-checks=*")
42 ENDIF(CLANG_TIDY)
42 ENDIF(CLANG_TIDY)
43
43
44 IF(IWYU)
44 IF(IWYU)
45 set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE "include-what-you-use")
45 set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE "include-what-you-use")
46 ENDIF(IWYU)
46 ENDIF(IWYU)
47
47
48 enable_testing()
48 enable_testing()
49
49
50
50
51 find_package(CatalogueAPI CONFIG QUIET)
51 find_package(CatalogueAPI CONFIG QUIET)
52 if (NOT CatalogueAPI_FOUND)
52 if (NOT CatalogueAPI_FOUND)
53 execute_process(COMMAND git submodule update --init external/CatalogueAPI WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
53 execute_process(COMMAND git submodule init external/CatalogueAPI WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
54 execute_process(COMMAND git submodule update external/CatalogueAPI WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
54 add_subdirectory(external/CatalogueAPI)
55 add_subdirectory(external/CatalogueAPI)
55 endif()
56 endif()
56
57
57 add_subdirectory(core)
58 add_subdirectory(core)
58 add_subdirectory(gui)
59 add_subdirectory(gui)
59 add_subdirectory(app)
60 add_subdirectory(app)
60 add_subdirectory(plugins)
61 add_subdirectory(plugins)
61 add_subdirectory(docs)
62 add_subdirectory(docs)
@@ -1,1 +1,1
1 Subproject commit 70f95c7d91c9a4e1ab52c427372757cc83a57de2
1 Subproject commit 232c863d6217298caf06deafb1dd821063f9efdc
General Comments 0
You need to be logged in to leave comments. Login now