remove zlib dependancy

dhkim0821 · Feb 4, 2019 · a6c9f60 · a6c9f60
1 parent ffc85a4
commit a6c9f60
Show file tree

Hide file tree

Showing 4 changed files with 553 additions and 23 deletions.
diff --git a/ExternalSource/Optimizer/CMakeLists.txt b/ExternalSource/Optimizer/CMakeLists.txt
@@ -1,12 +1,2 @@
 add_subdirectory(Goldfarb)
 
-if (CMAKE_SYSTEM_NAME MATCHES Linux)
-   find_library(gfortran NAMES libgfortran.so PATHS /usr/lib/gcc/x86_64-linux-gnu/4.8/)
-   if(gfortran)
-	   message("**** SNOPT Note: Found gfortran compiler. SNOPT will be compiled ")
-   	   add_subdirectory(snopt)
-   else()
-       message("**** SNOPT Note: Could not find gfortran compiler. SNOPT will not be compiled")
-   endif()
-endif (CMAKE_SYSTEM_NAME MATCHES Linux)
-
diff --git a/Simulator/srSimulator/assimp/contrib/zlib/CMakeLists.txt b/Simulator/srSimulator/assimp/contrib/zlib/CMakeLists.txt
@@ -89,7 +89,7 @@ set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein
 		${ZLIB_PC} @ONLY)
 configure_file(	${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
-		${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
+    ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h @ONLY)
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})
 
 
@@ -98,7 +98,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})
 #============================================================================
 
 set(ZLIB_PUBLIC_HDRS
-    ${CMAKE_CURRENT_BINARY_DIR}/zconf.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h
     zlib.h
 )
 set(ZLIB_PRIVATE_HDRS