Revision: 68956
http://sourceforge.net/p/brlcad/code/68956
Author: starseeker
Date: 2016-10-01 02:38:27 +0000 (Sat, 01 Oct 2016)
Log Message:
-----------
This seems to give a reproducible successfull build on BSD. May be overkill,
but checkpoint in working state so I don't lose the patch again...
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
brlcad/trunk/src/libbu/CMakeLists.txt
Added Paths:
-----------
brlcad/trunk/misc/CMake/FindUUID.cmake
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2016-10-01 02:17:37 UTC (rev 68955)
+++ brlcad/trunk/CMakeLists.txt 2016-10-01 02:38:27 UTC (rev 68956)
@@ -675,9 +675,6 @@
set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include)
include_directories(AFTER SYSTEM /usr/local/include)
endif (IS_DIRECTORY /usr/local/include)
- if (IS_DIRECTORY /usr/local/lib)
- LINK_DIRECTORIES(/usr/local/lib)
- endif (IS_DIRECTORY /usr/local/lib)
endif (IS_DIRECTORY /usr/local)
#---------------------------------------------------------------------
@@ -1873,6 +1870,7 @@
# uuid library
BRLCAD_CHECK_LIBRARY(UUID uuid uuid_generate)
+find_package(UUID)
# network socket library (linux, bsd)
BRLCAD_CHECK_LIBRARY(SOCKET socket socket)
Added: brlcad/trunk/misc/CMake/FindUUID.cmake
===================================================================
--- brlcad/trunk/misc/CMake/FindUUID.cmake (rev 0)
+++ brlcad/trunk/misc/CMake/FindUUID.cmake 2016-10-01 02:38:27 UTC (rev
68956)
@@ -0,0 +1,71 @@
+# - Find UUID
+# Find the native UUID includes and library
+# This module defines
+# UUID_INCLUDE_DIR, where to find jpeglib.h, etc.
+# UUID_LIBRARIES, the libraries needed to use UUID.
+# UUID_FOUND, If false, do not try to use UUID.
+# also defined, but not for general use are
+# UUID_LIBRARY, where to find the UUID library.
+#
+# Copyright (c) 2006-2011 Mathieu Malaterre <[email protected]>
+#
+# Redistribution and use is allowed according to the terms of the New
+# BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+# On MacOSX we have:
+# $ nm -g /usr/lib/libSystem.dylib | grep uuid_generate
+# 000b3aeb T _uuid_generate
+# 0003e67e T _uuid_generate_random
+# 000b37a1 T _uuid_generate_time
+if(APPLE)
+ set(UUID_LIBRARY_VAR System)
+else()
+ # Linux type:
+ set(UUID_LIBRARY_VAR uuid)
+endif()
+
+find_library(UUID_LIBRARY
+ NAMES ${UUID_LIBRARY_VAR}
+ PATHS /lib /usr/lib /usr/local/lib
+ )
+
+# Must be *after* the lib itself
+set(CMAKE_FIND_FRAMEWORK_SAVE ${CMAKE_FIND_FRAMEWORK})
+set(CMAKE_FIND_FRAMEWORK NEVER)
+
+find_path(UUID_INCLUDE_DIR uuid/uuid.h
+/usr/local/include
+/usr/include
+)
+
+if (UUID_LIBRARY AND UUID_INCLUDE_DIR)
+ set(UUID_LIBRARIES ${UUID_LIBRARY})
+ set(UUID_FOUND "YES")
+else ()
+ set(UUID_FOUND "NO")
+endif ()
+
+
+if (UUID_FOUND)
+ if (NOT UUID_FIND_QUIETLY)
+ message(STATUS "Found UUID: ${UUID_LIBRARIES}")
+ endif ()
+else ()
+ if (UUID_FIND_REQUIRED)
+ message( "library: ${UUID_LIBRARY}" )
+ message( "include: ${UUID_INCLUDE_DIR}" )
+ message(FATAL_ERROR "Could not find UUID library")
+ endif ()
+endif ()
+
+# Deprecated declarations.
+#set (NATIVE_UUID_INCLUDE_PATH ${UUID_INCLUDE_DIR} )
+#get_filename_component (NATIVE_UUID_LIB_PATH ${UUID_LIBRARY} PATH)
+
+mark_as_advanced(
+ UUID_LIBRARY
+ UUID_INCLUDE_DIR
+ )
+set(CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_SAVE})
Property changes on: brlcad/trunk/misc/CMake/FindUUID.cmake
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: brlcad/trunk/src/libbu/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libbu/CMakeLists.txt 2016-10-01 02:17:37 UTC (rev
68955)
+++ brlcad/trunk/src/libbu/CMakeLists.txt 2016-10-01 02:38:27 UTC (rev
68956)
@@ -9,7 +9,7 @@
endif(BRLCAD_ENABLE_BINARY_ATTRIBUTES)
# locally used but not needed by users of the library
-set(BU_LOCAL_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR})
+set(BU_LOCAL_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} ${UUID_INCLUDE_DIR})
BRLCAD_LIB_INCLUDE_DIRS(bu BU_INCLUDE_DIRS BU_LOCAL_INCLUDE_DIRS)
@@ -108,7 +108,7 @@
xdr.c
)
-BRLCAD_ADDLIB(libbu "${LIBBU_SOURCES}"
"${CMAKE_THREAD_LIBS_INIT};${DL_LIBRARY};${WINSOCK_LIB};${PSAPI_LIB};${UUID_LIBRARY};${BSON_LIBRARIES};${M_LIBRARY};y2038")
+BRLCAD_ADDLIB(libbu "${LIBBU_SOURCES}"
"${CMAKE_THREAD_LIBS_INIT};${DL_LIBRARY};${WINSOCK_LIB};${PSAPI_LIB};${UUID_LIBRARY};${BSON_LIBRARIES};${UUID_LIBRARIES};${M_LIBRARY};y2038")
set_target_properties(libbu PROPERTIES VERSION 20.0.1 SOVERSION 20)
if(CPP_DLL_DEFINES)
set_property(TARGET libbu APPEND PROPERTY COMPILE_DEFINITIONS
"Y2038_DLL_IMPORTS")
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
