switch to staticopeniss for windows support

a-drew · a-drew · commit 176df12cd501 · 2021-04-22T21:09:59.000-04:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -55,7 +55,7 @@ include(BuildOpenISS)
 set(EXEC SunRay)
 file(GLOB_RECURSE SRC src/*.cpp)
 add_executable(${EXEC} ${SRC})
-target_link_libraries(${EXEC} OpenGL::GL glew_s glfw glm openiss stb)
+target_link_libraries(${EXEC} OpenGL::GL glew_s glfw glm openiss-static stb)
 list(APPEND BIN ${EXEC})
 
 add_custom_command(TARGET SunRay POST_BUILD
diff --git a/cmake/BuildOpenISS.cmake b/cmake/BuildOpenISS.cmake
@@ -31,7 +31,7 @@ if(NOT ${THIRDPARTY}_POPULATED)
         EXCLUDE_FROM_ALL
     )
 
-    target_include_directories(openiss INTERFACE $<BUILD_INTERFACE:${${THIRDPARTY}_BINARY_DIR}/include>)
-    target_include_directories(openiss INTERFACE $<BUILD_INTERFACE:${${THIRDPARTY}_SOURCE_DIR}/include>)
+    target_include_directories(openiss-static INTERFACE $<BUILD_INTERFACE:${${THIRDPARTY}_BINARY_DIR}/include>)
+    target_include_directories(openiss-static INTERFACE $<BUILD_INTERFACE:${${THIRDPARTY}_SOURCE_DIR}/include>)
 endif()
 

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ if(NOT ${THIRDPARTY}_POPULATED)`
`31`	`31`	`EXCLUDE_FROM_ALL`
`32`	`32`	`)`
`33`	`33`
`34`		`- target_include_directories(openiss INTERFACE $<BUILD_INTERFACE:${${THIRDPARTY}_BINARY_DIR}/include>)`
`35`		`- target_include_directories(openiss INTERFACE $<BUILD_INTERFACE:${${THIRDPARTY}_SOURCE_DIR}/include>)`
	`34`	`+ target_include_directories(openiss-static INTERFACE $<BUILD_INTERFACE:${${THIRDPARTY}_BINARY_DIR}/include>)`
	`35`	`+ target_include_directories(openiss-static INTERFACE $<BUILD_INTERFACE:${${THIRDPARTY}_SOURCE_DIR}/include>)`
`36`	`36`	`endif()`
`37`	`37`