From 521c5b014be30e1efc00e560d529c070a42f7aba Mon Sep 17 00:00:00 2001 From: Karsten Rink <karsten.rink@ufz.de> Date: Wed, 1 Oct 2014 14:31:13 +0200 Subject: [PATCH] adjusted cmake files --- Applications/CMakeLists.txt | 1 - Applications/Utils/CMakeLists.txt | 4 ++++ Applications/Utils/OGSFileConverter/CMakeLists.txt | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Applications/CMakeLists.txt b/Applications/CMakeLists.txt index b4247018c10..9b9c5ad1716 100644 --- a/Applications/CMakeLists.txt +++ b/Applications/CMakeLists.txt @@ -7,5 +7,4 @@ ENDIF() # OGS_BUILD_UTILS AND NOT IS_SUBPROJECT IF(OGS_BUILD_GUI) ADD_DEFINITIONS(-DOGS_BUILD_GUI) ADD_SUBDIRECTORY(DataExplorer) - ADD_SUBDIRECTORY(Utils/OGSFileConverter) ENDIF() # OGS_BUILD_GUI diff --git a/Applications/Utils/CMakeLists.txt b/Applications/Utils/CMakeLists.txt index 363765401e0..333890eabce 100644 --- a/Applications/Utils/CMakeLists.txt +++ b/Applications/Utils/CMakeLists.txt @@ -1,3 +1,7 @@ ADD_SUBDIRECTORY( FileConverter ) ADD_SUBDIRECTORY( MeshEdit ) ADD_SUBDIRECTORY( SimpleMeshCreation ) + +IF(OGS_BUILD_GUI) + ADD_SUBDIRECTORY(OGSFileConverter) +ENDIF() # OGS_BUILD_GUI diff --git a/Applications/Utils/OGSFileConverter/CMakeLists.txt b/Applications/Utils/OGSFileConverter/CMakeLists.txt index af3d891b0e4..7f4f3c5eb6e 100644 --- a/Applications/Utils/OGSFileConverter/CMakeLists.txt +++ b/Applications/Utils/OGSFileConverter/CMakeLists.txt @@ -88,6 +88,8 @@ set ( CMAKE_CONFIGURATION_TYPES "Release;Debug" CACHE TYPE INTERNAL FORCE ) set( EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin ) set( LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib ) +SET_PROPERTY(TARGET OGSFileConverter PROPERTY FOLDER "Utilities") + #################### ### Installation ### #################### -- GitLab