Skip to content

Commit df4bf95

Browse files
Revert "vendor portable-file-dialogs"
This reverts commit 7d303fa.
1 parent 7d303fa commit df4bf95

22 files changed

+14
-2864
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
[submodule "Extern/alpaka"]
2020
path = Extern/alpaka
2121
url = https://github.com/alpaka-group/alpaka.git
22+
[submodule "Extern/portable-file-dialogs"]
23+
path = Extern/portable-file-dialogs
24+
url = https://github.com/samhocevar/portable-file-dialogs.git
2225
[submodule "Extern/SDL"]
2326
path = Extern/SDL
2427
url = https://github.com/libsdl-org/SDL

CMakeLists.txt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ option(RAYX_REQUIRE_OPENMP "If option 'RAYX_ENABLE_OPENMP' is ON, this option wi
2424
option(RAYX_ENABLE_H5 "This option enables the search for HDF5. Project will be compiled without HDF5 if not found." ON)
2525
option(RAYX_REQUIRE_H5 "If option 'RAYX_ENABLE_H5' is ON, this option will add the requirement that HDF5 must be found." OFF)
2626
option(RAYX_STATIC_LIB "This option builds 'rayx-core' as a static library." OFF)
27-
option(RAYX_CMD "This option builds 'rayx'" YES)
28-
set(RAYX_CUSTOM_DATA_DIR "" CACHE STRING "This option allows to set a custom data directory for rayx-core.")
29-
3027
# ------------------
3128

3229

@@ -67,11 +64,7 @@ if(APPLE)
6764
set(INSTALL_DATA_DIR "Library/Application Support/${PROJECT_NAME}")
6865
set(INSTALL_FONTS_DIR "Library/Fonts/${PROJECT_NAME}")
6966
elseif(UNIX AND NOT APPLE)
70-
if(RAYX_CUSTOM_DATA_DIR STREQUAL "")
71-
set(INSTALL_DATA_DIR "share/${PROJECT_NAME}")
72-
else()
73-
set(INSTALL_DATA_DIR "${RAYX_CUSTOM_DATA_DIR}/${PROJECT_NAME}")
74-
endif()
67+
set(INSTALL_DATA_DIR "share/${PROJECT_NAME}")
7568
set(INSTALL_FONTS_DIR "share/fonts/${PROJECT_NAME}")
7669
elseif(WIN32)
7770
set(INSTALL_DATA_DIR ".")

Extern/portable-file-dialogs

Submodule portable-file-dialogs added at 7f852d8

Extern/portable-file-dialogs/.gitignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

Extern/portable-file-dialogs/.lgtm.yml

Lines changed: 0 additions & 5 deletions
This file was deleted.

Extern/portable-file-dialogs/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
This file was deleted.

Extern/portable-file-dialogs/COPYING

Lines changed: 0 additions & 14 deletions
This file was deleted.

Extern/portable-file-dialogs/README.md

Lines changed: 0 additions & 64 deletions
This file was deleted.

Extern/portable-file-dialogs/doc/message.md

Lines changed: 0 additions & 97 deletions
This file was deleted.

Extern/portable-file-dialogs/doc/notify.md

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)