Skip to content
Snippets Groups Projects
Commit c804a508 authored by Joseph Boudreau's avatar Joseph Boudreau
Browse files

Fixup makefiles so that these examples compile either as single directories or... 

Fixup makefiles so that these examples compile either as single directories or as part of a build.  Do not require special versions of GeoModel:  I will propose that these examples be distributed not as useful compiled executables, but rather as source code, for people to learn from.  Additionally, I believe that these should be carefully scrutinized and annotated with abundant comments for pedagogical purposes, and probably also referenced in the documentation.
parent 54eede2a
No related branches found
No related tags found
1 merge request!44Fixup makefiles so that these examples compile either as single directories or...
Hide whitespace changes
Inline Side-by-side
Showing
with 39 additions and 36 deletions
GeoModelExamples/GeoActions/CMakeLists.txt
+ 3
− 3
View file @ c804a508
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
cmake_minimum_required(VERSION 3.1.0) cmake_minimum_required(VERSION 3.1.0)
project(GeoActions) #project(GeoActions)
# Compile with C++17 # Compile with C++17
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
...@@ -15,8 +15,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) ...@@ -15,8 +15,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS ON) set(CMAKE_CXX_EXTENSIONS ON)
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) # when building individually if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) # when building individually
find_package( GeoModelCore REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder find_package( GeoModelCore REQUIRED )
find_package( GeoModelIO REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder find_package( GeoModelIO REQUIRED )
endif() endif()
# Find includes in current dir # Find includes in current dir
......
GeoModelExamples/GeoFullPhysVol/CMakeLists.txt
+ 3
− 3
View file @ c804a508
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
cmake_minimum_required(VERSION 3.1.0) cmake_minimum_required(VERSION 3.1.0)
project(GeoFullPhysVolEx) #project(GeoFullPhysVolEx)
# Compile with C++17 # Compile with C++17
...@@ -17,8 +17,8 @@ set(CMAKE_CXX_EXTENSIONS ON) ...@@ -17,8 +17,8 @@ set(CMAKE_CXX_EXTENSIONS ON)
# Find the needed dependencies, when building individually # Find the needed dependencies, when building individually
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
find_package( GeoModelCore REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder find_package( GeoModelCore REQUIRED )
find_package( GeoModelIO REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder find_package( GeoModelIO REQUIRED )
endif() endif()
# Find includes in current dir # Find includes in current dir
......
GeoModelExamples/GeoShapeExamples/CMakeLists.txt
+ 3
− 3
View file @ c804a508
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
cmake_minimum_required(VERSION 3.1.0) cmake_minimum_required(VERSION 3.1.0)
project(GeoShapeExamples) #project(GeoShapeExamples)
# Compile with C++17 # Compile with C++17
...@@ -17,8 +17,8 @@ set(CMAKE_CXX_EXTENSIONS ON) ...@@ -17,8 +17,8 @@ set(CMAKE_CXX_EXTENSIONS ON)
# Find the needed dependencies, when building individually # Find the needed dependencies, when building individually
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
find_package( GeoModelCore REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder find_package( GeoModelCore REQUIRED )
find_package( GeoModelIO REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder find_package( GeoModelIO REQUIRED )
endif() endif()
# Find includes in current dir # Find includes in current dir
......
GeoModelExamples/GeoShiftUnion/CMakeLists.txt
+ 3
− 3
View file @ c804a508
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
cmake_minimum_required(VERSION 3.1.0) cmake_minimum_required(VERSION 3.1.0)
project(GeoShiftUnion) #project(GeoShiftUnion)
# Compile with C++17 # Compile with C++17
...@@ -17,8 +17,8 @@ set(CMAKE_CXX_EXTENSIONS ON) ...@@ -17,8 +17,8 @@ set(CMAKE_CXX_EXTENSIONS ON)
# Find the needed dependencies, when building individually # Find the needed dependencies, when building individually
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
find_package( GeoModelCore REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder find_package( GeoModelCore REQUIRED )
find_package( GeoModelIO REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder find_package( GeoModelIO REQUIRED )
endif() endif()
# Find includes in current dir # Find includes in current dir
......
GeoModelExamples/GeoTessellatedSolidExamples/CMakeLists.txt
+ 3
− 3
View file @ c804a508
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
cmake_minimum_required(VERSION 3.1.0) cmake_minimum_required(VERSION 3.1.0)
project(GeoTessellatedSolidExample) #project(GeoTessellatedSolidExample)
# Compile with C++17 # Compile with C++17
...@@ -17,8 +17,8 @@ set(CMAKE_CXX_EXTENSIONS ON) ...@@ -17,8 +17,8 @@ set(CMAKE_CXX_EXTENSIONS ON)
# Find the needed dependencies, when building individually # Find the needed dependencies, when building individually
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
find_package( GeoModelCore REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder find_package( GeoModelCore REQUIRED )
find_package( GeoModelIO REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder find_package( GeoModelIO REQUIRED)
endif() endif()
# Find includes in current dir # Find includes in current dir
......
GeoModelExamples/HelloDummyMaterial/CMakeLists.txt
+ 3
− 3
View file @ c804a508
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
cmake_minimum_required(VERSION 3.1.0) cmake_minimum_required(VERSION 3.1.0)
project(HelloDummyMaterial) #project(HelloDummyMaterial)
# Compile with C++17 # Compile with C++17
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
...@@ -16,8 +16,8 @@ set(CMAKE_CXX_EXTENSIONS ON) ...@@ -16,8 +16,8 @@ set(CMAKE_CXX_EXTENSIONS ON)
# Find the needed dependencies, when building individually # Find the needed dependencies, when building individually
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
find_package( GeoModelCore REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder find_package( GeoModelCore REQUIRED )
find_package( GeoModelIO REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder find_package( GeoModelIO REQUIRED )
endif() endif()
# Find includes in current dir # Find includes in current dir
......
GeoModelExamples/HelloGeo/CMakeLists.txt
+ 6
− 3
View file @ c804a508
...@@ -12,11 +12,14 @@ set(CMAKE_CXX_STANDARD 17) ...@@ -12,11 +12,14 @@ set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS ON) set(CMAKE_CXX_EXTENSIONS ON)
project(HelloGeo) #project(HelloGeo)
# Find the needed dependencies, when building individually # Find the needed dependencies, when building individually
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) # when building individually message (${CMAKE_SOURCE_DIR})
find_package( GeoModelCore REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder message (${PROJECT_SOURCE_DIR})
if ( CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR ) # when buildingindividually
find_package( GeoModelCore REQUIRED )
endif() endif()
# Find includes in current dir # Find includes in current dir
......
GeoModelExamples/HelloGeoRead/CMakeLists.txt
+ 3
− 3
View file @ c804a508
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
cmake_minimum_required(VERSION 3.1.0) cmake_minimum_required(VERSION 3.1.0)
project(HelloGeoRead) #project(HelloGeoRead)
# Compile with C++17 # Compile with C++17
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
...@@ -16,8 +16,8 @@ set(CMAKE_CXX_EXTENSIONS ON) ...@@ -16,8 +16,8 @@ set(CMAKE_CXX_EXTENSIONS ON)
# Find the needed dependencies, when building individually # Find the needed dependencies, when building individually
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
find_package( GeoModelCore REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder find_package( GeoModelCore REQUIRED )
find_package( GeoModelIO REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder find_package( GeoModelIO REQUIRED )
endif() endif()
# Find includes in current dir # Find includes in current dir
......
GeoModelExamples/HelloGeoRead2G4/CMakeLists.txt
+ 3
− 3
View file @ c804a508
...@@ -7,15 +7,15 @@ ...@@ -7,15 +7,15 @@
cmake_minimum_required(VERSION 3.1.0) cmake_minimum_required(VERSION 3.1.0)
project(HelloGeoRead2G4) #project(HelloGeoRead2G4)
# Find includes in current dir # Find includes in current dir
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
# Find the needed dependencies, when building individually # Find the needed dependencies, when building individually
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
find_package( GeoModelCore REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder find_package( GeoModelCore REQUIRED )
find_package( GeoModelIO REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder find_package( GeoModelIO REQUIRED )
endif() endif()
## External dependencies. ## External dependencies.
......
GeoModelExamples/HelloGeoWrite/CMakeLists.txt
+ 3
− 3
View file @ c804a508
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
cmake_minimum_required(VERSION 3.1.0) cmake_minimum_required(VERSION 3.1.0)
project(HelloGeoWrite) #project(HelloGeoWrite)
# Compile with C++17 # Compile with C++17
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
...@@ -15,8 +15,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) ...@@ -15,8 +15,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS ON) set(CMAKE_CXX_EXTENSIONS ON)
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) # when building individually if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) # when building individually
find_package( GeoModelCore REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder find_package( GeoModelCore REQUIRED )
find_package( GeoModelIO REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder find_package( GeoModelIO REQUIRED )
endif() endif()
# Find includes in current dir # Find includes in current dir
......
GeoModelExamples/HelloToy/CMakeLists.txt
+ 3
− 3
View file @ c804a508
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
cmake_minimum_required(VERSION 3.1.0) cmake_minimum_required(VERSION 3.1.0)
project(HelloToy) #project(HelloToy)
# Compile with C++17 # Compile with C++17
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
...@@ -16,8 +16,8 @@ set(CMAKE_CXX_EXTENSIONS ON) ...@@ -16,8 +16,8 @@ set(CMAKE_CXX_EXTENSIONS ON)
# Find the needed dependencies, when building individually # Find the needed dependencies, when building individually
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
find_package( GeoModelCore REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder find_package( GeoModelCore REQUIRED )
find_package( GeoModelIO REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder find_package( GeoModelIO REQUIRED )
endif() endif()
# Find includes in current dir # Find includes in current dir
......
GeoModelExamples/HelloToyDetectorFactory/CMakeLists.txt
+ 3
− 3
View file @ c804a508
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
cmake_minimum_required(VERSION 3.1.0) cmake_minimum_required(VERSION 3.1.0)
project(HelloToyDetectorFactory) #project(HelloToyDetectorFactory)
# Compile with C++17 # Compile with C++17
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
...@@ -16,8 +16,8 @@ set(CMAKE_CXX_EXTENSIONS ON) ...@@ -16,8 +16,8 @@ set(CMAKE_CXX_EXTENSIONS ON)
# Find the needed dependencies, when building individually # Find the needed dependencies, when building individually
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
find_package( GeoModelCore REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder find_package( GeoModelCore REQUIRED )
find_package( GeoModelIO REQUIRED 4.1.0 ) #TODO: the version should be se in the root folder find_package( GeoModelIO REQUIRED )
endif() endif()
# Find includes in current dir # Find includes in current dir
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment