Skip to content
Snippets Groups Projects
Commit 49eaba02 authored by Riccardo Maria Bianchi's avatar Riccardo Maria Bianchi :sunny:
Browse files

Merge branch 'master-drop-qt5' into 'master' 

clean CMake

See merge request GeoModelIO!11
parents e19e0370 ce178b4d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
CMakeLists.txt
+ 2
− 2
View file @ 49eaba02
...@@ -25,7 +25,6 @@ include( PrintBuildInfo ) ...@@ -25,7 +25,6 @@ include( PrintBuildInfo )
# Project's dependencies. # Project's dependencies.
find_package( GeoModelCore 3.2.0 REQUIRED ) find_package( GeoModelCore 3.2.0 REQUIRED )
# find_package( Qt5 COMPONENTS Core Sql REQUIRED )
find_package( SQLite3 REQUIRED ) find_package( SQLite3 REQUIRED )
# Set sub-packages to build. # Set sub-packages to build.
...@@ -83,7 +82,8 @@ install( ...@@ -83,7 +82,8 @@ install(
# updating the code, which results in keeping running the same old code even if # updating the code, which results in keeping running the same old code even if
# we modified our source code. # we modified our source code.
#export(EXPORT ${PROJECT_NAME}-export NAMESPACE "${PROJECT_NAME}::" FILE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${PROJECT_NAME}Config.cmake) #export(EXPORT ${PROJECT_NAME}-export NAMESPACE "${PROJECT_NAME}::" FILE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${PROJECT_NAME}Config.cmake)
export(TARGETS GeoModelErrorHandler GeoModelDBManager TFPersistification GeoModelRead GeoModelWrite NAMESPACE "${PROJECT_NAME}::" FILE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${PROJECT_NAME}Targets.cmake) #export(TARGETS GeoModelErrorHandler GeoModelDBManager TFPersistification GeoModelRead GeoModelWrite NAMESPACE "${PROJECT_NAME}::" FILE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${PROJECT_NAME}Targets.cmake)
export(TARGETS GeoModelDBManager TFPersistification GeoModelRead GeoModelWrite NAMESPACE "${PROJECT_NAME}::" FILE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${PROJECT_NAME}Targets.cmake)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment