Skip to content

Commit d429a77

Browse files
VolkerEnderleinVolkerEnderlein
committed
Updated CMake scripts, added CI. [skip ci]
1 parent 496d8e9 commit d429a77

File tree

22 files changed

+462
-48
lines changed

22 files changed

+462
-48
lines changed

‎CMakeLists.txt

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
11
cmake_minimum_required(VERSION 3.0)
22

3-
set(Gui "Qt" CACHE STRING "Target GUI for the examples")
4-
set_property(CACHE Gui PROPERTY STRINGS Qt Xt Win)
3+
set(Gui "Qt" CACHE STRING "Target GUI for the GUI toolkit examples")
4+
set(GuiValues "Qt;Xt;Win;Wx" CACHE INTERNAL "List of supported values for the Gui cache variable")
5+
set_property(CACHE Gui PROPERTY STRINGS ${GuiValues})
56
message(STATUS "Gui='${Gui}'")
67

78
# ############################################################################
89

910
if(Gui STREQUAL "Qt")
1011
set(SOQTEXAMPLES TRUE)
11-
set(GUI QT)
1212
set(WIDGET QWidget*)
1313
elseif(Gui STREQUAL "Xt")
14-
set(GUI XT)
1514
set(WIDGET Widget)
1615
elseif(Gui STREQUAL "Win")
17-
set(GUI WIN)
1816
set(WIDGET HWND)
1917
elseif(Gui STREQUAL "Wx")
20-
set(GUI WX)
2118
set(WIDGET wxWindow*)
2219
else()
2320
message(FATAL_ERROR "Only Qt, Win, Xt and Wx supported: please set Gui to one of these values")
2421
endif()
22+
string(TOUPPER ${Gui} GUI)
2523

2624
project(So${Gui}Examples VERSION 1.0.0)
2725
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)

‎actions/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
2-
include_directories(${CMAKE_CURRENT_BINARY_DIR})
1+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
32

43
#intersection example
54
configure_file(intersection.cpp.in intersection.cpp)

‎annex/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
include_directories(${Coin_INCLUDE_DIR}/Inventor/annex)
2-
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
3-
include_directories(${CMAKE_CURRENT_BINARY_DIR})
2+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
43

54
#hardcopy example
65
configure_file(hardcopy.cpp.in hardcopy.cpp)

‎appveyor.yml

+435
Large diffs are not rendered by default.

‎coin-competitions/SIM-20010803/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
2-
include_directories(${CMAKE_CURRENT_BINARY_DIR})
1+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
32

43
#chart example
54
configure_file(chart.cpp.in chart.cpp)

‎coin-competitions/SIM-20010824/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
2-
include_directories(${CMAKE_CURRENT_BINARY_DIR})
1+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
32

43
#smiley example
54
configure_file(smiley.cpp.in smiley.cpp)

‎coin-competitions/SIM-20010914/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
2-
include_directories(${CMAKE_CURRENT_BINARY_DIR})
1+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
32

43
#moolah example
54
configure_file(Moolah.cpp.in Moolah.cpp)

‎coin-competitions/SIM-20011005/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
2-
include_directories(${CMAKE_CURRENT_BINARY_DIR})
1+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
32

43
#lorenz example
54
configure_file(lorenz.cpp.in lorenz.cpp)

‎coin-competitions/SIM-20011116/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
2-
include_directories(${CMAKE_CURRENT_BINARY_DIR})
1+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
32

43
#25bc5bb example
54
configure_file(25bc5bb.cpp.in 25bc5bb.cpp)

‎coin-competitions/SIM-20020118/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
2-
include_directories(${CMAKE_CURRENT_BINARY_DIR})
1+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
32

43
#blocks example
54
configure_file(blocks.cpp.in blocks.cpp)

‎coin-competitions/SIM-20020503/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
2-
include_directories(${CMAKE_CURRENT_BINARY_DIR})
1+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
32

43
#ballinthehoop example
54
configure_file(ballinthehoop.cpp.in ballinthehoop.cpp)

‎components/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
2-
include_directories(${CMAKE_CURRENT_BINARY_DIR})
1+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
32

43
#configure files
54
configure_file(SoGuiSnapshotViewer.h.in SoGuiSnapshotViewer.h)

‎draggers/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
2-
include_directories(${CMAKE_CURRENT_BINARY_DIR})
1+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
32

43
#jackdragger example
54
configure_file(jackdragger.cpp.in jackdragger.cpp)

‎engines/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
2-
include_directories(${CMAKE_CURRENT_BINARY_DIR})
1+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
32

43
#computebbox example
54
configure_file(computebbox.cpp.in computebbox.cpp)

‎eyecandy/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
2-
include_directories(${CMAKE_CURRENT_BINARY_DIR})
1+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
32

43
#moirepatterns example
54
configure_file(moirepatterns.cpp.in moirepatterns.cpp)

‎manipulators/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
2-
include_directories(${CMAKE_CURRENT_BINARY_DIR})
1+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
32

43
#pointlightmanip example
54
configure_file(pointlightmanip.cpp.in pointlightmanip.cpp)

‎nodekits/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
2-
include_directories(${CMAKE_CURRENT_BINARY_DIR})
1+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
32

43
#scalemarker example
54
if(SIMVoleon_FOUND)

‎nodes/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
2-
include_directories(${CMAKE_CURRENT_BINARY_DIR})
1+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
32

43
#atmospheric example
54
configure_file(atmospheric.cpp.in atmospheric.cpp)

‎sensors/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
2-
include_directories(${CMAKE_CURRENT_BINARY_DIR})
1+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
32

43
#timersensor example
54
configure_file(timersensor.cpp.in timersensor.cpp)

‎sound/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
2-
include_directories(${CMAKE_CURRENT_BINARY_DIR})
1+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
32

43
#audiocallback example
54
configure_file(audiocallback.cpp.in audiocallback.cpp)

‎volumerendering/CMakeLists.txt

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
if(Qt6_FOUND OR Qt5_FOUND OR Qt4_FOUND)
2-
set(CMAKE_AUTOMOC TRUE)
3-
set(CMAKE_AUTOUIC TRUE)
2+
set(CMAKE_AUTOMOC ON)
3+
set(CMAKE_AUTOUIC ON)
44

5-
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
6-
include_directories(${CMAKE_CURRENT_BINARY_DIR})
5+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
76

87
add_subdirectory(Cute)
98

‎volumerendering/Cute/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
2+
13
include_directories(
2-
${CMAKE_CURRENT_SOURCE_DIR}
34
${CMAKE_CURRENT_BINARY_DIR}/curvep
45
${CMAKE_CURRENT_BINARY_DIR}/gradientp
5-
${CMAKE_CURRENT_BINARY_DIR}
66
)
77

88
set(cute_SRC

0 commit comments

Comments
 (0)