Revision: 77833
http://sourceforge.net/p/brlcad/code/77833
Author: starseeker
Date: 2020-11-30 18:44:47 +0000 (Mon, 30 Nov 2020)
Log Message:
-----------
Couple others that fit the initial pattern, but others do not...
Modified Paths:
--------------
brlcad/branches/extbuild/misc/CMake/BRLCAD_Util.cmake
brlcad/branches/extbuild/src/libbu/tbl.c
brlcad/branches/extbuild/src/other/ext/bson.cmake
brlcad/branches/extbuild/src/other/ext/proj4.cmake
brlcad/branches/extbuild/src/other/ext/zlib.cmake
Modified: brlcad/branches/extbuild/misc/CMake/BRLCAD_Util.cmake
===================================================================
--- brlcad/branches/extbuild/misc/CMake/BRLCAD_Util.cmake 2020-11-30
18:35:52 UTC (rev 77832)
+++ brlcad/branches/extbuild/misc/CMake/BRLCAD_Util.cmake 2020-11-30
18:44:47 UTC (rev 77833)
@@ -619,8 +619,8 @@
set(${RVAR}_BASENAME "${${RVAR}_BASENAME}" PARENT_SCOPE)
set(${RVAR}_STATICNAME "${${RVAR}_STATICNAME}" PARENT_SCOPE)
set(${RVAR}_SUFFIX "${${RVAR}_SUFFIX}" PARENT_SCOPE)
- set(${RVAR}_SYMLINK1 "${${RVAR}_SYMLINK1}" PARENT_SCOPE)
- set(${RVAR}_SYMLINK2 "${${RVAR}_SYMLINK2}" PARENT_SCOPE)
+ set(${RVAR}_SYMLINK_1 "${${RVAR}_SYMLINK_1}" PARENT_SCOPE)
+ set(${RVAR}_SYMLINK_2 "${${RVAR}_SYMLINK_2}" PARENT_SCOPE)
endfunction(set_lib_vars RVAR root)
Modified: brlcad/branches/extbuild/src/libbu/tbl.c
===================================================================
--- brlcad/branches/extbuild/src/libbu/tbl.c 2020-11-30 18:35:52 UTC (rev
77832)
+++ brlcad/branches/extbuild/src/libbu/tbl.c 2020-11-30 18:44:47 UTC (rev
77833)
@@ -205,7 +205,7 @@
back--;
}
while (zeros--) {
- ft_printf(tbl->t, "");
+ ft_printf(tbl->t, " ");
}
ft_printf(tbl->t, "%s", cstr);
last = cstr;
@@ -224,7 +224,7 @@
back--;
}
while (zeros--) {
- ft_printf(tbl->t, "");
+ ft_printf(tbl->t, " ");
}
ft_printf(tbl->t, "%s", cstr);
@@ -239,7 +239,7 @@
last++;
}
while (zeros--) {
- ft_printf(tbl->t, "");
+ ft_printf(tbl->t, " ");
}
return tbl;
Modified: brlcad/branches/extbuild/src/other/ext/bson.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/bson.cmake 2020-11-30 18:35:52 UTC
(rev 77832)
+++ brlcad/branches/extbuild/src/other/ext/bson.cmake 2020-11-30 18:44:47 UTC
(rev 77833)
@@ -15,28 +15,8 @@
if (BRLCAD_BSON_BUILD)
- set(BSON_MAJOR_VERSION 1)
- set(BSON_MINOR_VERSION 3)
- set(BSON_PATCH_VERSION 5)
- set(BSON_VERSION
${BSON_MAJOR_VERSION}.${BSON_MINOR_VERSION}.${BSON_PATCH_VERSION})
+ set_lib_vars(BSON bson-1.0 "1" "3" "5")
- if (MSVC)
- set(BSON_BASENAME bson-1.0)
- set(BSON_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
- set(BSON_SYMLINK_1 ${BSON_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
- set(BSON_SYMLINK_2
${BSON_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${BSON_MAJOR_VERSION})
- elseif (APPLE)
- set(BSON_BASENAME libbson-1.0)
- set(BSON_SUFFIX .${BSON_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
- set(BSON_SYMLINK_1 ${BSON_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
- set(BSON_SYMLINK_2
${BSON_BASENAME}.${BSON_MAJOR_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
- else (MSVC)
- set(BSON_BASENAME libbson-1.0)
- set(BSON_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}.${BSON_VERSION})
- set(BSON_SYMLINK_1 ${BSON_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
- set(BSON_SYMLINK_2
${BSON_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${BSON_MAJOR_VERSION})
- endif (MSVC)
-
ExternalProject_Add(BSON_BLD
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/bson"
BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
Modified: brlcad/branches/extbuild/src/other/ext/proj4.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/proj4.cmake 2020-11-30 18:35:52 UTC
(rev 77832)
+++ brlcad/branches/extbuild/src/other/ext/proj4.cmake 2020-11-30 18:44:47 UTC
(rev 77833)
@@ -19,25 +19,7 @@
set(PROJ_API_VERSION 12)
set(PROJ_VERSION
${PROJ_MAJOR_VERSION}.${PROJ_MINOR_VERSION}.${PROJ_API_VERSION})
- if (MSVC)
- set(PROJ_BASENAME proj)
- set(PROJ_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
- set(PROJ_SYMLINK_1 ${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
- set(PROJ_SYMLINK_2
${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${PROJ_API_VERSION})
- elseif (APPLE)
- set(PROJ_BASENAME libproj)
- set(PROJ_SUFFIX .${PROJ_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
- set(PROJ_SYMLINK_1 ${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
- set(PROJ_SYMLINK_2
${PROJ_BASENAME}.${PROJ_API_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
- elseif (OPENBSD)
- set(PROJ_BASENAME libproj)
- set(PROJ_SUFFIX
${CMAKE_SHARED_LIBRARY_SUFFIX}.${PROJ_MAJOR_VERSION}.${PROJ_MINOR_VERSION})
- else (MSVC)
- set(PROJ_BASENAME libproj)
- set(PROJ_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}.${PROJ_VERSION})
- set(PROJ_SYMLINK_1 ${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
- set(PROJ_SYMLINK_2
${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${PROJ_API_VERSION})
- endif (MSVC)
+ set_lib_vars(PROJ proj "4" "9" "12")
set(PROJ4_INSTDIR ${CMAKE_BINARY_INSTALL_ROOT}/proj-4)
Modified: brlcad/branches/extbuild/src/other/ext/zlib.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/zlib.cmake 2020-11-30 18:35:52 UTC
(rev 77832)
+++ brlcad/branches/extbuild/src/other/ext/zlib.cmake 2020-11-30 18:44:47 UTC
(rev 77833)
@@ -20,29 +20,7 @@
add_definitions(-DZ_PREFIX_STR=${Z_PREFIX_STR})
set(Z_PREFIX_STR "${Z_PREFIX_STR}" CACHE STRING "prefix for zlib functions"
FORCE)
- if (MSVC)
- set(ZLIB_BASENAME z_brl)
- set(ZLIB_STATICNAME z_brl_static)
- set(ZLIB_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
- set(ZLIB_SYMLINK_1 ${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
- set(ZLIB_SYMLINK_2 ${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.1)
- elseif (APPLE)
- set(ZLIB_BASENAME libz_brl)
- set(ZLIB_STATICNAME libz_brl)
- set(ZLIB_SUFFIX .${ZLIB_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
- set(ZLIB_SYMLINK_1 ${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
- set(ZLIB_SYMLINK_2 ${ZLIB_BASENAME}.1${CMAKE_SHARED_LIBRARY_SUFFIX})
- elseif (OPENBSD)
- set(ZLIB_BASENAME libz_brl)
- set(ZLIB_STATICNAME libz_brl)
- set(ZLIB_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}.1.2)
- else (MSVC)
- set(ZLIB_BASENAME libz_brl)
- set(ZLIB_STATICNAME libz_brl)
- set(ZLIB_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}.${ZLIB_VERSION})
- set(ZLIB_SYMLINK_1 ${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
- set(ZLIB_SYMLINK_2 ${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.1)
- endif (MSVC)
+ set_lib_vars(ZLIB z_brl "1" "2" "11")
set(ZLIB_INSTDIR ${CMAKE_BINARY_INSTALL_ROOT}/zlib)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
