Revision: 76041
http://sourceforge.net/p/brlcad/code/76041
Author: starseeker
Date: 2020-06-06 15:15:13 +0000 (Sat, 06 Jun 2020)
Log Message:
-----------
Rather than setting top level definitions, use our wrapper functions to set
BRLCADBUILD and HAVE_CONFIG_H definitions per-target.
Modified Paths:
--------------
brlcad/trunk/bench/CMakeLists.txt
brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
brlcad/trunk/regress/ged/CMakeLists.txt
brlcad/trunk/regress/pkg/CMakeLists.txt
brlcad/trunk/regress/repository/CMakeLists.txt
brlcad/trunk/src/CMakeLists.txt
Modified: brlcad/trunk/bench/CMakeLists.txt
===================================================================
--- brlcad/trunk/bench/CMakeLists.txt 2020-06-06 15:13:18 UTC (rev 76040)
+++ brlcad/trunk/bench/CMakeLists.txt 2020-06-06 15:15:13 UTC (rev 76041)
@@ -2,11 +2,7 @@
include_directories(${BU_INCLUDE_DIRS})
-add_definitions(
- -DHAVE_CONFIG_H
- -DBRLCADBUILD
- -DCONSOLE
- )
+add_definitions(-DCONSOLE)
BRLCAD_ADDEXEC(pixcmp pixcmp.c libbu)
set(BARK_SOURCES
Modified: brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
===================================================================
--- brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2020-06-06 15:13:18 UTC
(rev 76040)
+++ brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2020-06-06 15:15:13 UTC
(rev 76041)
@@ -364,6 +364,9 @@
add_executable(${execname} ${srcslist})
endif(E_GUI)
+ # Set the standard build definitions for all BRL-CAD targets
+ target_compile_definitions(${execname} PUBLIC BRLCADBUILD HAVE_CONFIG_H)
+
# Let CMAKEFILES know what's going on
CMAKEFILES(${srcslist})
@@ -465,6 +468,9 @@
set(lsrcslist $<TARGET_OBJECTS:${libname}-obj>)
set_target_properties(${libname}-obj PROPERTIES FOLDER "BRL-CAD OBJECT
Libraries${SUBFOLDER}")
+ # Set the standard build definitions for all BRL-CAD targets
+ target_compile_definitions(${libname}-obj PUBLIC BRLCADBUILD HAVE_CONFIG_H)
+
if(HIDE_INTERNAL_SYMBOLS)
string(REPLACE "lib" "" LOWERCORE "${libname}")
string(TOUPPER ${LOWERCORE} UPPER_CORE)
@@ -486,6 +492,9 @@
add_library(${libname} SHARED ${lsrcslist} ${L_SHARED_SRCS})
+ # Set the standard build definitions for all BRL-CAD targets
+ target_compile_definitions(${libname} PUBLIC BRLCADBUILD HAVE_CONFIG_H)
+
if(HIDE_INTERNAL_SYMBOLS)
string(REPLACE "lib" "" LOWERCORE "${libname}")
string(TOUPPER ${LOWERCORE} UPPER_CORE)
@@ -502,6 +511,10 @@
set(libstatic ${libname}-static)
endif(L_STATIC)
add_library(${libstatic} STATIC ${lsrcslist} ${L_STATIC_SRCS})
+
+ # Set the standard build definitions for all BRL-CAD targets
+ target_compile_definitions(${libstatic} PUBLIC BRLCADBUILD HAVE_CONFIG_H)
+
if(NOT MSVC)
set_target_properties(${libstatic} PROPERTIES OUTPUT_NAME "${libname}")
endif(NOT MSVC)
Modified: brlcad/trunk/regress/ged/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/ged/CMakeLists.txt 2020-06-06 15:13:18 UTC (rev
76040)
+++ brlcad/trunk/regress/ged/CMakeLists.txt 2020-06-06 15:15:13 UTC (rev
76041)
@@ -3,13 +3,7 @@
include_directories(${GED_INCLUDE_DIRS})
-add_definitions(
- -DHAVE_CONFIG_H
- -DBRLCADBUILD
- )
-
BRLCAD_ADDEXEC(regress_mater mater.c libged TEST_USESDATA)
-target_compile_definitions(regress_mater PUBLIC BRLCADBUILD HAVE_CONFIG_H)
BRLCAD_REGRESSION_TEST(regress-ged_mater "regress_mater;density_DATAFILES_cp"
EXEC regress_mater)
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/regress-ged_mater.log")
Modified: brlcad/trunk/regress/pkg/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/pkg/CMakeLists.txt 2020-06-06 15:13:18 UTC (rev
76040)
+++ brlcad/trunk/regress/pkg/CMakeLists.txt 2020-06-06 15:15:13 UTC (rev
76041)
@@ -6,7 +6,6 @@
)
BRLCAD_ADDEXEC(regress_pkg regress_pkg.cpp
"libpkg;libbu;${CMAKE_THREAD_LIBS_INIT}" NO_INSTALL)
-target_compile_definitions(regress_pkg PUBLIC BRLCADBUILD HAVE_CONFIG_H)
set_target_properties(regress_pkg PROPERTIES FOLDER "BRL-CAD Regression
Tests/libpkg")
BRLCAD_REGRESSION_TEST(regress-pkg "regress_pkg" EXEC regress_pkg STAND_ALONE)
Modified: brlcad/trunk/regress/repository/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/repository/CMakeLists.txt 2020-06-06 15:13:18 UTC
(rev 76040)
+++ brlcad/trunk/regress/repository/CMakeLists.txt 2020-06-06 15:15:13 UTC
(rev 76041)
@@ -6,7 +6,6 @@
# Build a scanner to check the repository for various problems
BRLCAD_ADDEXEC(repocheck repocheck.cpp "libbu;${CMAKE_THREAD_LIBS_INIT}" TEST)
-target_compile_definitions(repocheck PUBLIC BRLCADBUILD HAVE_CONFIG_H)
if (O3_COMPILER_FLAG)
# This check benefits greatly from optimization. If we have the O3 flag, use
# it - whether or not the standard build settings would add it.
Modified: brlcad/trunk/src/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/CMakeLists.txt 2020-06-06 15:13:18 UTC (rev 76040)
+++ brlcad/trunk/src/CMakeLists.txt 2020-06-06 15:15:13 UTC (rev 76041)
@@ -5,14 +5,6 @@
# Minimal directories required for any BRL-CAD functionality
-# Define some common definitions here that are used
-# in most BRL-CAD directories
-
-add_definitions(
- -DHAVE_CONFIG_H
- -DBRLCADBUILD=1
- )
-
if(MSVC)
add_definitions(
-D_CRT_SECURE_NO_WARNINGS
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
