From d76bb43be8048a44e517032dca6bdb67a3d464c1 Mon Sep 17 00:00:00 2001
From: Riccardo Maria Bianchi <riccardo.maria.bianchi@cern.ch>
Date: Mon, 8 Jun 2020 18:09:15 +0200
Subject: [PATCH] removing old Qt5 settings
---
GeoModelDBManager/CMakeLists.txt | 4 ----
GeoModelRead/CMakeLists.txt | 7 +------
GeoModelWrite/CMakeLists.txt | 4 ----
TFPersistification/CMakeLists.txt | 5 -----
4 files changed, 1 insertion(+), 19 deletions(-)
diff --git a/GeoModelDBManager/CMakeLists.txt b/GeoModelDBManager/CMakeLists.txt
index f601567a1..e8a2d34c6 100644
--- a/GeoModelDBManager/CMakeLists.txt
+++ b/GeoModelDBManager/CMakeLists.txt
@@ -24,10 +24,6 @@ source_group( "src" FILES ${SOURCES} )
set_target_properties( GeoModelDBManager PROPERTIES
VERSION ${PROJECT_VERSION}
SOVERSION ${PROJECT_VERSION_MAJOR} )
-if( "${CMAKE_BUILD_TYPE}" STREQUAL "Release" OR
- "${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo" )
- target_compile_definitions( GeoModelDBManager PUBLIC -DQT_NO_DEBUG_OUTPUT )
-endif()
# Install the library.
install( TARGETS GeoModelDBManager
diff --git a/GeoModelRead/CMakeLists.txt b/GeoModelRead/CMakeLists.txt
index 0bffad89b..04aabc25b 100644
--- a/GeoModelRead/CMakeLists.txt
+++ b/GeoModelRead/CMakeLists.txt
@@ -11,7 +11,7 @@ file( GLOB HEADERS GeoModelRead/*.h )
# Set up the library.
add_library( GeoModelRead SHARED ${HEADERS} ${SOURCES} )
-target_link_libraries( GeoModelRead PUBLIC
+target_link_libraries( GeoModelRead PUBLIC
GeoModelCore::GeoModelKernel GeoModelDBManager TFPersistification )
target_include_directories( GeoModelRead PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
@@ -21,11 +21,6 @@ source_group( "src" FILES ${SOURCES} )
set_target_properties( GeoModelRead PROPERTIES
VERSION ${PROJECT_VERSION}
SOVERSION ${PROJECT_VERSION_MAJOR} )
-if( "${CMAKE_BUILD_TYPE}" STREQUAL "Release" OR
- "${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo" )
- target_compile_definitions( GeoModelRead PUBLIC QT_NO_DEBUG_OUTPUT )
-endif()
-
# Install the library.
install( TARGETS GeoModelRead
diff --git a/GeoModelWrite/CMakeLists.txt b/GeoModelWrite/CMakeLists.txt
index 0e0f17efe..de55ebf97 100644
--- a/GeoModelWrite/CMakeLists.txt
+++ b/GeoModelWrite/CMakeLists.txt
@@ -16,10 +16,6 @@ source_group( "src" FILES ${SOURCES} )
set_target_properties( GeoModelWrite PROPERTIES
VERSION ${PROJECT_VERSION}
SOVERSION ${PROJECT_VERSION_MAJOR} )
-if( "${CMAKE_BUILD_TYPE}" STREQUAL "Release" OR
- "${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo" )
- target_compile_definitions( GeoModelWrite PUBLIC -DQT_NO_DEBUG_OUTPUT )
-endif()
# Install the library.
install( TARGETS GeoModelWrite
diff --git a/TFPersistification/CMakeLists.txt b/TFPersistification/CMakeLists.txt
index f8214a025..2701c8268 100644
--- a/TFPersistification/CMakeLists.txt
+++ b/TFPersistification/CMakeLists.txt
@@ -16,11 +16,6 @@ source_group( "src" FILES ${SOURCES} )
set_target_properties( TFPersistification PROPERTIES
VERSION ${PROJECT_VERSION}
SOVERSION ${PROJECT_VERSION_MAJOR} )
-if( "${CMAKE_BUILD_TYPE}" STREQUAL "Release" OR
- "${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo" )
- target_compile_definitions( TFPersistification PUBLIC
- -DQT_NO_DEBUG_OUTPUT )
-endif()
# Install the library.
install( TARGETS TFPersistification
--
GitLab