Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

exclude non-64-bit-modules from 64 bit builds #398

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

exclude non-64-bit-modules from 64 bit builds #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Src/Celbody/Ariel/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ set_target_properties(${CELBODY}
FOLDER Celbody
)

if(NOT CMAKE_CL_64) #remove me when this celbody has source code that can be built
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have BUILD64 macro in root CMakeLists.txt - worth using that for consistency

# Installation
install(PROGRAMS
${CELBODY}.dll
Expand All @@ -36,3 +37,4 @@ install(PROGRAMS
install(DIRECTORY Config
DESTINATION ${ORBITER_INSTALL_ROOT_DIR}
)
endif()
3 changes: 2 additions & 1 deletion Src/Celbody/Deimos/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ set_target_properties(${CELBODY}
PROPERTIES
FOLDER Celbody
)

if(NOT CMAKE_CL_64) #remove me when this celbody has source code that can be built
# Installation
install(PROGRAMS
${CELBODY}.dll
Expand All @@ -36,3 +36,4 @@ install(PROGRAMS
install(DIRECTORY Config
DESTINATION ${ORBITER_INSTALL_ROOT_DIR}
)
endif()
2 changes: 2 additions & 0 deletions Src/Celbody/Miranda/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ set_target_properties(${CELBODY}
FOLDER Celbody
)

if(NOT CMAKE_CL_64) #remove me when this celbody has source code that can be built
# Installation
install(PROGRAMS
${CELBODY}.dll
Expand All @@ -36,3 +37,4 @@ install(PROGRAMS
install(DIRECTORY Config
DESTINATION ${ORBITER_INSTALL_ROOT_DIR}
)
endif()
3 changes: 2 additions & 1 deletion Src/Celbody/Oberon/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ set_target_properties(${CELBODY}
PROPERTIES
FOLDER Celbody
)

if(NOT CMAKE_CL_64) #remove me when this celbody has source code that can be built
#Installation
install(PROGRAMS
${CELBODY}.dll
Expand All @@ -36,3 +36,4 @@ install(PROGRAMS
install(DIRECTORY Config
DESTINATION ${ORBITER_INSTALL_ROOT_DIR}
)
endif()
3 changes: 2 additions & 1 deletion Src/Celbody/Phobos/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ set_target_properties(${CELBODY}
PROPERTIES
FOLDER Celbody
)

if(NOT CMAKE_CL_64) #remove me when this celbody has source code that can be built
# Installation
install(PROGRAMS
${CELBODY}.dll
Expand All @@ -36,3 +36,4 @@ install(PROGRAMS
install(DIRECTORY Config
DESTINATION ${ORBITER_INSTALL_ROOT_DIR}
)
endif()
36 changes: 36 additions & 0 deletions Src/Celbody/Sol/Config/Sol64.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
; === Configuration file for solar system ===
Name = Sol

Star1 = Sun
Planet1 = Mercury
Planet2 = Venus
Planet3 = Earth
Earth:Moon1 = Moon
Planet4 = Mars
;Mars:Moon1 = Phobos
;Mars:Moon2 = Deimos
Planet5 = Vesta
Planet6 = Jupiter
Jupiter:Moon1 = Io
Jupiter:Moon2 = Europa
Jupiter:Moon3 = Ganymede
Jupiter:Moon4 = Callisto
Planet7 = Saturn
Saturn:Moon1 = Mimas
Saturn:Moon2 = Enceladus
Saturn:Moon3 = Tethys
Saturn:Moon4 = Dione
Saturn:Moon5 = Rhea
Saturn:Moon6 = Titan
Saturn:Moon7 = Hyperion
Saturn:Moon8 = Iapetus
Planet8 = Uranus
;Uranus:Moon1 = Miranda
;Uranus:Moon2 = Ariel
;Uranus:Moon3 = Umbriel
;Uranus:Moon4 = Titania
;Uranus:Moon5 = Oberon
Planet9 = Neptune
;Neptune:Moon1 = Triton
Neptune:Moon2 = Proteus
Neptune:Moon3 = Nereid
3 changes: 2 additions & 1 deletion Src/Celbody/Titania/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ set_target_properties(${CELBODY}
PROPERTIES
FOLDER Celbody
)

if(NOT CMAKE_CL_64) #remove me when this celbody has source code that can be built
# Installation
install(PROGRAMS
${CELBODY}.dll
Expand All @@ -36,3 +36,4 @@ install(PROGRAMS
install(DIRECTORY Config
DESTINATION ${ORBITER_INSTALL_ROOT_DIR}
)
endif()
3 changes: 2 additions & 1 deletion Src/Celbody/Triton/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ set_target_properties(${CELBODY}
PROPERTIES
FOLDER Celbody
)

if(NOT CMAKE_CL_64) #remove me when this celbody has source code that can be built
# Installation
install(PROGRAMS
${CELBODY}.dll
Expand All @@ -36,3 +36,4 @@ install(PROGRAMS
install(DIRECTORY Config
DESTINATION ${ORBITER_INSTALL_ROOT_DIR}
)
endif()
3 changes: 2 additions & 1 deletion Src/Celbody/Umbriel/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ set_target_properties(${CELBODY}
PROPERTIES
FOLDER Celbody
)

if(NOT CMAKE_CL_64) #remove me when this celbody has source code that can be built
# Installation
install(PROGRAMS
${CELBODY}.dll
Expand All @@ -36,3 +36,4 @@ install(PROGRAMS
install(DIRECTORY Config
DESTINATION ${ORBITER_INSTALL_ROOT_DIR}
)
endif()
Loading