compile fixes

Author: DanielsCreation

cmake/windows/FindFREEGLUT.cmake

@@ -21,48 +21,41 @@
 #  License text for the above reference.)
 
 IF (WIN32)
-
   SET(FREEGLUT_PACKAGE_DEFINITIONS "-DFREEGLUT_NO_LIB_PRAGMA")
-  FIND_PATH( FREEGLUT_INCLUDE_DIR NAMES GL/glut.h 
-    PATHS  
-    $ENV{EXTERNLIBS}/freeglut/include
-    ${FREEGLUT_ROOT_PATH}/include )
-  FIND_LIBRARY( FREEGLUT_LIBRARY_DEBUG NAMES glutD glut32D freeglutD glut freeglut
+  FIND_PATH(FREEGLUT_INCLUDE_DIR
+    NAMES GL/freeglut.h
     PATHS
-    $ENV{EXTERNLIBS}/freeglut/lib
-    ${OPENGL_LIBRARY_DIR}
-    ${FREEGLUT_ROOT_PATH}/Debug
+      $ENV{EXTERNLIBS}/freeglut/include
+      $ENV{EXTERNLIBS}/zebu/freeglut/include
+      ${FREEGLUT_ROOT_PATH}/include
+  )
+
+  if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    set(_FREEGLUT_LIB_PATHS
+      $ENV{EXTERNLIBS}/freeglut/lib/x64
+      $ENV{EXTERNLIBS}/zebu/freeglut/lib/x64
+      ${FREEGLUT_ROOT_PATH}/lib/x64
+      $ENV{EXTERNLIBS}/freeglut/lib
+      $ENV{EXTERNLIBS}/zebu/freeglut/lib
+      ${FREEGLUT_ROOT_PATH}/lib
     )
-   if(NOT FREEGLUT_LIBRARY_DEBUG)
-       FIND_LIBRARY( FREEGLUT_LIBRARY_DEBUG NAMES glut glut32 freeglut
-           PATHS $ENV{EXTERNLIBS}/freeglut/lib
-           ${OPENGL_LIBRARY_DIR}/debug/lib
-           ${FREEGLUT_ROOT_PATH}/debug/lib
-           )
-   endif()
-    FIND_LIBRARY( FREEGLUT_LIBRARY_RELEASE NAMES glut glut32 freeglut
-    PATHS
-    ${OPENGL_LIBRARY_DIR}
-    $ENV{EXTERNLIBS}/freeglut/lib
-    ${FREEGLUT_ROOT_PATH}/Release
+  else()
+    set(_FREEGLUT_LIB_PATHS
+      $ENV{EXTERNLIBS}/freeglut/lib
+      $ENV{EXTERNLIBS}/zebu/freeglut/lib
+      ${FREEGLUT_ROOT_PATH}/lib
     )
-    IF(CMAKE_CONFIGURATION_TYPES)
-      IF (FREEGLUT_LIBRARY_DEBUG AND FREEGLUT_LIBRARY_RELEASE)
-         SET(FREEGLUT_LIBRARY optimized ${FREEGLUT_LIBRARY_RELEASE} debug ${FREEGLUT_LIBRARY_DEBUG})
-      ELSE (FREEGLUT_LIBRARY_DEBUG AND FREEGLUT_LIBRARY_RELEASE)
-         SET(FREEGLUT_LIBRARY NOTFOUND)
-         MESSAGE(STATUS "Could not find the debug AND release version of zlib")
-      ENDIF (FREEGLUT_LIBRARY_DEBUG AND FREEGLUT_LIBRARY_RELEASE)
-    ELSE()
-      STRING(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER)
-      IF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
-         SET(FREEGLUT_LIBRARY ${FREEGLUT_LIBRARY_DEBUG})
-      ELSE(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
-         SET(FREEGLUT_LIBRARY ${FREEGLUT_LIBRARY_RELEASE})
-      ENDIF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
-    ENDIF()
-    MARK_AS_ADVANCED(FREEGLUT_LIBRARY_DEBUG FREEGLUT_LIBRARY_RELEASE)
-  ELSE (WIN32)
+  endif()
+
+  FIND_LIBRARY(FREEGLUT_LIBRARY
+    NAMES freeglut freeglut_static
+    PATHS ${_FREEGLUT_LIB_PATHS}
+  )
+
+  SET(FREEGLUT_LIBRARIES ${FREEGLUT_LIBRARY})
+  MARK_AS_ADVANCED(FREEGLUT_LIBRARY)
+  
+ELSE (WIN32)
 
   IF (APPLE)
     # These values for Apple could probably do with improvement.
@@ -116,11 +109,13 @@ IF (WIN32)
 ENDIF (WIN32)
 
 IF(MSVC)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(FREEGLUT DEFAULT_MSG FREEGLUT_LIBRARY_RELEASE FREEGLUT_LIBRARY_DEBUG FREEGLUT_INCLUDE_DIR)
-  MARK_AS_ADVANCED(FREEGLUT_LIBRARY_RELEASE FREEGLUT_LIBRARY_DEBUG)
-    SET( FREEGLUT_LIBRARIES ${FREEGLUT_LIBRARY}) 
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(FREEGLUT DEFAULT_MSG
+    FREEGLUT_LIBRARY FREEGLUT_INCLUDE_DIR)
+  SET(FREEGLUT_LIBRARIES ${FREEGLUT_LIBRARY})
+  MARK_AS_ADVANCED(FREEGLUT_LIBRARY)
 ELSE(MSVC)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(FREEGLUT DEFAULT_MSG FREEGLUT_LIBRARY FREEGLUT_INCLUDE_DIR)
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(FREEGLUT DEFAULT_MSG
+    FREEGLUT_LIBRARY FREEGLUT_INCLUDE_DIR)
   MARK_AS_ADVANCED(FREEGLUT_LIBRARY)
 ENDIF(MSVC)
 

src/OpenCOVER/utils/read/csv/csv.h

@@ -1,9 +1,12 @@
 #ifndef _READ_CSV_H
 #define _READ_CSV_H
 
+#ifdef _WIN32
 #include <boost/filesystem.hpp>
+#else
 #include <boost/filesystem.hpp>
-//#include <boost/filesystem/directory.hpp>
+#include <boost/filesystem/directory.hpp>
+#endif
 #include <algorithm>
 #include <array>
 #include <fstream>

src/OpenCOVER/vrml97/vrml/CMakeLists.txt

@@ -61,8 +61,8 @@ ENDIF()
 
 IF(PTHREAD_FOUND)
   ADD_DEFINITIONS(-DHAVE_PTHREAD)
-  LIST(APPEND EXTRA_INCS ${PTHREAD_INCLUDE_DIR})
-  LIST(APPEND EXTRA_LIBS ${PTHREAD_LIBRARIES})
+  SET(EXTRA_INCS ${EXTRA_INCS} ${PTHREAD_INCLUDE_DIR})
+  SET(EXTRA_LIBS ${EXTRA_LIBS} ${PTHREAD_LIBRARIES})
 ENDIF()
 
 ADD_DEFINITIONS(-DYY_NEVER_INTERACTIVE)