Skip to content
Snippets Groups Projects
Commit dda97c75 authored by Shaun Roe's avatar Shaun Roe Committed by Vakhtang Tsulaia
Browse files

Correct compilation

parent 56ca9b68
Branches
Tags
1 merge request!462Correct compilation
Pipeline #12185890 passed
...@@ -14,7 +14,7 @@ source_group( "GeoModelErrorHandler" FILES ${HEADERS} ) ...@@ -14,7 +14,7 @@ source_group( "GeoModelErrorHandler" FILES ${HEADERS} )
target_include_directories( GeoModelErrorHandler INTERFACE target_include_directories( GeoModelErrorHandler INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> ) $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
target_link_libraries( GeoModelErrorHandler INTERFACE Qt5::Core ) target_link_libraries( GeoModelErrorHandler INTERFACE Qt${QT_VERSION}::Core )
if( "${CMAKE_BUILD_TYPE}" STREQUAL "Release" OR if( "${CMAKE_BUILD_TYPE}" STREQUAL "Release" OR
"${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo" ) "${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo" )
target_compile_definitions( GeoModelErrorHandler INTERFACE target_compile_definitions( GeoModelErrorHandler INTERFACE
......
...@@ -79,7 +79,7 @@ class IO { ...@@ -79,7 +79,7 @@ class IO {
return db; return db;
} }
static PVConstlink loadDB(const std::string path, unsigned loglevel = 0) { static PVConstLink loadDB(const std::string path, unsigned loglevel = 0) {
// check if DB file exists. // check if DB file exists.
// If not, print a warning message and return a nullptr. // If not, print a warning message and return a nullptr.
std::ifstream inputfile(path.c_str()); std::ifstream inputfile(path.c_str());
......
...@@ -24,7 +24,7 @@ find_package( CLHEP ) # Remove this dependency: it is brough in by TFPersistific ...@@ -24,7 +24,7 @@ find_package( CLHEP ) # Remove this dependency: it is brough in by TFPersistific
### External Dependencies ### External Dependencies
# Find the Qt5 libraries, used e.g. to interface with the SQlite DB # Find the Qt5 libraries, used e.g. to interface with the SQlite DB
find_package(Qt5 COMPONENTS Core Sql Widgets REQUIRED) # TODO: remove Qt dependency, which comes from GeoModelDBManager find_package(Qt${QT_VERSION} COMPONENTS Core Sql Widgets REQUIRED) # TODO: remove Qt dependency, which comes from GeoModelDBManager
# Instruct CMake to run Qt5 moc automatically when needed # Instruct CMake to run Qt5 moc automatically when needed
set(CMAKE_AUTOMOC ON) # TODO: do we need this here?? set(CMAKE_AUTOMOC ON) # TODO: do we need this here??
...@@ -36,7 +36,7 @@ set(SRCS main.cpp ) ...@@ -36,7 +36,7 @@ set(SRCS main.cpp )
add_executable( hellogeo ${SRCS} ) add_executable( hellogeo ${SRCS} )
# Link all needed libraries # Link all needed libraries
target_link_libraries( hellogeo Qt5::Core Qt5::Sql GeoModelDBManager GeoModelRead GeoModelKernel GeoModelUtilities) target_link_libraries( hellogeo Qt${QT_VERSION}::Core Qt${QT_VERSION}::Sql GeoModelDBManager GeoModelRead GeoModelKernel GeoModelUtilities)
# Set include directories # Set include directories
target_include_directories( hellogeo SYSTEM PUBLIC ${GeoModelRead_INCLUDE_DIRS} ${GeoModelUtilities_INCLUDE_DIRS} ) target_include_directories( hellogeo SYSTEM PUBLIC ${GeoModelRead_INCLUDE_DIRS} ${GeoModelUtilities_INCLUDE_DIRS} )
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment