Revision: 77470
http://sourceforge.net/p/brlcad/code/77470
Author: starseeker
Date: 2020-10-17 14:49:01 +0000 (Sat, 17 Oct 2020)
Log Message:
-----------
Eliminate wrapper for add_library.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
brlcad/trunk/src/libbu/tests/dylib/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2020-10-17 14:39:03 UTC (rev 77469)
+++ brlcad/trunk/CMakeLists.txt 2020-10-17 14:49:01 UTC (rev 77470)
@@ -366,17 +366,6 @@
if(NOT BRLCAD_IS_SUBBUILD)
- # Override and wrap add_library. Avoid doubling up on the lib prefix for
- # libraries if the target name is lib<target>.
- #
- # TODO - move this to BRLCAD_ADDLIB, avoid the redefinition
- function(add_library name)
- _add_library(${name} ${ARGN})
- if(${name} MATCHES "^lib*")
- set_target_properties(${name} PROPERTIES PREFIX "")
- endif(${name} MATCHES "^lib*")
- endfunction(add_library)
-
# Override and wrap configure_file. In the case of configure_file, we'll
# check that the file is part of the source tree and not itself a
# generated file, but not reject full-path entries since there are quite a
Modified: brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
===================================================================
--- brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2020-10-17 14:39:03 UTC
(rev 77469)
+++ brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2020-10-17 14:49:01 UTC
(rev 77470)
@@ -433,6 +433,10 @@
# If we need it, set up the OBJECT library build
if(USE_OBJECT_LIBS)
add_library(${libname}-obj OBJECT ${lsrcslist})
+ if(${libname} MATCHES "^lib*")
+ set_target_properties(${libname}-obj PROPERTIES PREFIX "")
+ endif(${libname} MATCHES "^lib*")
+
set(lsrcslist $<TARGET_OBJECTS:${libname}-obj>)
set_target_properties(${libname}-obj PROPERTIES FOLDER "BRL-CAD OBJECT
Libraries${SUBFOLDER}")
@@ -458,6 +462,9 @@
if(L_SHARED OR (BUILD_SHARED_LIBS AND NOT L_STATIC))
add_library(${libname} SHARED ${lsrcslist} ${L_SHARED_SRCS})
+ if(${libname} MATCHES "^lib*")
+ set_target_properties(${libname} PROPERTIES PREFIX "")
+ endif(${libname} MATCHES "^lib*")
# Set the standard build definitions for all BRL-CAD targets
target_compile_definitions(${libname} PRIVATE BRLCADBUILD HAVE_CONFIG_H)
@@ -476,6 +483,9 @@
set(libstatic ${libname}-static)
endif(L_STATIC)
add_library(${libstatic} STATIC ${lsrcslist} ${L_STATIC_SRCS})
+ if(${libstatic} MATCHES "^lib*")
+ set_target_properties(${libstatic} PROPERTIES PREFIX "")
+ endif(${libstatic} MATCHES "^lib*")
# Set the standard build definitions for all BRL-CAD targets
target_compile_definitions(${libstatic} PRIVATE BRLCADBUILD HAVE_CONFIG_H)
Modified: brlcad/trunk/src/libbu/tests/dylib/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libbu/tests/dylib/CMakeLists.txt 2020-10-17 14:39:03 UTC
(rev 77469)
+++ brlcad/trunk/src/libbu/tests/dylib/CMakeLists.txt 2020-10-17 14:49:01 UTC
(rev 77470)
@@ -32,6 +32,7 @@
endforeach (target_name${plugins})
add_library(libdylib SHARED dylib.c)
+set_target_properties(libdylib PROPERTIES PREFIX "")
if (HIDE_INTERNAL_SYMBOLS)
set_property(TARGET plugin_1 APPEND PROPERTY COMPILE_DEFINITIONS
BU_DYLIB_DLL_EXPORTS)
set_property(TARGET plugin_2 APPEND PROPERTY COMPILE_DEFINITIONS
BU_DYLIB_DLL_EXPORTS)
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
