Move glut frontend to its own subdir
parent
fbd83e5587
commit
6be3afb1e6
|
@ -56,21 +56,7 @@ cotire(celestia)
|
||||||
|
|
||||||
#install(TARGETS celestia LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
#install(TARGETS celestia LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||||
|
|
||||||
# celestia-glut binary
|
add_subdirectory(glut)
|
||||||
if(ENABLE_GLUT)
|
|
||||||
find_package(GLUT)
|
|
||||||
if(NOT GLUT_FOUND)
|
|
||||||
message(WARNING "GLUT library isn't found, not building GLUT fronend.")
|
|
||||||
else()
|
|
||||||
set(GLUT_SOURCES glutmain.cpp)
|
|
||||||
add_executable(celestia-glut ${GLUT_SOURCES})
|
|
||||||
cotire(celestia-glut)
|
|
||||||
target_include_directories(celestia-glut PRIVATE ${GLUT_INCLUDE_DIR})
|
|
||||||
target_link_libraries(celestia-glut ${CELESTIA_LIBS} ${GLUT_LIBRARIES})
|
|
||||||
install(TARGETS celestia-glut RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
add_subdirectory(gtk)
|
add_subdirectory(gtk)
|
||||||
add_subdirectory(qt)
|
add_subdirectory(qt)
|
||||||
add_subdirectory(win32)
|
add_subdirectory(win32)
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
if(NOT ENABLE_GLUT)
|
||||||
|
message(STATUS "GLUT frontend is disabled.")
|
||||||
|
return()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
find_package(GLUT REQUIRED)
|
||||||
|
set(GLUT_SOURCES glutmain.cpp)
|
||||||
|
add_executable(celestia-glut ${GLUT_SOURCES})
|
||||||
|
target_include_directories(celestia-glut PRIVATE ${GLUT_INCLUDE_DIR})
|
||||||
|
target_link_libraries(celestia-glut ${CELESTIA_LIBS} ${GLUT_LIBRARIES})
|
||||||
|
install(TARGETS celestia-glut RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
|
@ -30,7 +30,7 @@
|
||||||
#include <celutil/debug.h>
|
#include <celutil/debug.h>
|
||||||
#include <celmath/mathlib.h>
|
#include <celmath/mathlib.h>
|
||||||
#include <celengine/astro.h>
|
#include <celengine/astro.h>
|
||||||
#include "celestiacore.h"
|
#include <celestia/celestiacore.h>
|
||||||
/* what are you supposed to be?
|
/* what are you supposed to be?
|
||||||
#include "popt.h"
|
#include "popt.h"
|
||||||
*/
|
*/
|
||||||
|
@ -551,5 +551,3 @@ int main(int argc, char* argv[])
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue