Merge pull request #268 from AWoloszyn/update-cmake

CMake: Updated to better organize folders and options.
This commit is contained in:
John Kessenich 2016-05-05 13:46:36 -06:00
commit e2d06dbf60
10 changed files with 33 additions and 0 deletions

View file

@ -75,6 +75,7 @@ set(HEADERS
# set(BISON_GLSLParser_OUTPUT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/MachineIndependent/glslang_tab.cpp)
add_library(glslang STATIC ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS})
set_property(TARGET glslang PROPERTY FOLDER glslang)
if(WIN32)
source_group("Public" REGULAR_EXPRESSION "Public/*")

View file

@ -1,4 +1,5 @@
add_library(OSDependent STATIC ossource.cpp ../osinclude.h)
set_property(TARGET OSDependent PROPERTY FOLDER glslang)
install(TARGETS OSDependent
ARCHIVE DESTINATION lib)

View file

@ -1,6 +1,7 @@
set(SOURCES ossource.cpp ../osinclude.h)
add_library(OSDependent STATIC ${SOURCES})
set_property(TARGET OSDependent PROPERTY FOLDER glslang)
# MinGW GCC complains about function pointer casts to void*.
# Turn that off with -fpermissive.