mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add guard to gaia.scene to log error if the Gaia module was not compiled

Browse Source 
Point to correct shader paths
Remove warnings
This commit is contained in:
Alexander Bock
2018-11-20 18:40:04 -05:00
parent 0d2935c43b
commit d37cfa4f18
9 changed files with 77 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modules/fitsfilereader/CMakeLists.txt
View File

@@ -23,24 +23,26 @@
##########################################################################################
include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
include(${GHOUL_BASE_DIR}/support/cmake/handle_external_library.cmake)
set(HEADER_FILES
${CMAKE_CURRENT_SOURCE_DIR}/fitsfilereadermodule.h
${CMAKE_CURRENT_SOURCE_DIR}/include/fitsfilereader.h
set(HEADER_FILES
${CMAKE_CURRENT_SOURCE_DIR}/fitsfilereadermodule.h
${CMAKE_CURRENT_SOURCE_DIR}/include/fitsfilereader.h
)
source_group("Header Files" FILES ${HEADER_FILES})
set(SOURCE_FILES
${CMAKE_CURRENT_SOURCE_DIR}/fitsfilereadermodule.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/fitsfilereader.cpp
${CMAKE_CURRENT_SOURCE_DIR}/fitsfilereadermodule.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/fitsfilereader.cpp
)
source_group("Source Files" FILES ${SOURCE_FILES})
create_new_module(
"FitsFileReader"
fitsfilereader
${HEADER_FILES}
${SOURCE_FILES})
"FitsFileReader"
fitsfilereader
${HEADER_FILES}
${SOURCE_FILES}
)
# Set root directories for external libraries.
set(CFITSIO_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ext/cfitsio/")
@@ -50,7 +52,11 @@ set(MODULE_NAME openspace-module-fitsfilereader)
# CCfits is dependent on cfitsio, let it handle the internal linking
add_subdirectory(${CFITSIO_ROOT_DIR})
set_folder_location(cfitsio "External")
add_subdirectory(${CCFITS_ROOT_DIR})
set_folder_location(CCfits "External")
TARGET_INCLUDE_DIRECTORIES(${MODULE_NAME} SYSTEM PUBLIC ${INCLUDES_FOR_TARGET})
TARGET_LINK_LIBRARIES(${MODULE_NAME} CCfits)