Revision: 76045
http://sourceforge.net/p/brlcad/code/76045
Author: starseeker
Date: 2020-06-06 18:45:23 +0000 (Sat, 06 Jun 2020)
Log Message:
-----------
Shifting the target property setting to private exposed some issues with how we
were applying compile definitions.
Modified Paths:
--------------
brlcad/trunk/regress/user/CMakeLists.txt
brlcad/trunk/regress/user/cad_user.c
brlcad/trunk/src/bwish/CMakeLists.txt
brlcad/trunk/src/conv/step/ap203e2-g/CMakeLists.txt
brlcad/trunk/src/conv/step/ap214-g/CMakeLists.txt
brlcad/trunk/src/conv/step/ap242-g/CMakeLists.txt
brlcad/trunk/src/conv/step/g-ap203e2/CMakeLists.txt
brlcad/trunk/src/conv/step/g-ap214/CMakeLists.txt
brlcad/trunk/src/conv/step/g-ap242/CMakeLists.txt
brlcad/trunk/src/conv/step/g-step/CMakeLists.txt
brlcad/trunk/src/conv/step/ifc-g/CMakeLists.txt
brlcad/trunk/src/conv/step/util/CMakeLists.txt
brlcad/trunk/src/external/Creo/CMakeLists.txt
brlcad/trunk/src/external/Cubit/CMakeLists.txt
brlcad/trunk/src/external/Unigraphics/CMakeLists.txt
brlcad/trunk/src/libbu/tests/dylib/CMakeLists.txt
brlcad/trunk/src/remrt/CMakeLists.txt
Modified: brlcad/trunk/regress/user/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/user/CMakeLists.txt 2020-06-06 17:20:58 UTC (rev
76044)
+++ brlcad/trunk/regress/user/CMakeLists.txt 2020-06-06 18:45:23 UTC (rev
76045)
@@ -15,6 +15,7 @@
# this code as well, so long as they don't also contain anything that ties this
# code to any internal, compile time behaviors or features.
+if(0)
# We deliberately do not use any of the BRL-CAD wrapper macros, to avoid
automatic
# addtiion of compile defintions or other magic specific to BRL-CAD's internal
build.
add_executable(cad_user cad_user.c)
@@ -21,7 +22,8 @@
target_link_libraries(cad_user libged)
target_include_directories(cad_user PUBLIC
"${CMAKE_BINARY_DIR}/${INCLUDE_DIR}/brlcad")
-set_target_properties(lcheck PROPERTIES FOLDER "BRL-CAD Regression Tests/user")
+set_target_properties(cad_user PROPERTIES FOLDER "BRL-CAD Regression
Tests/user")
+endif(0)
set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/regress-user.log")
#BRLCAD_REGRESSION_TEST(regress-user "cad_user;moss.g" EXEC cad_user)
Modified: brlcad/trunk/regress/user/cad_user.c
===================================================================
--- brlcad/trunk/regress/user/cad_user.c 2020-06-06 17:20:58 UTC (rev
76044)
+++ brlcad/trunk/regress/user/cad_user.c 2020-06-06 18:45:23 UTC (rev
76045)
@@ -25,7 +25,6 @@
*/
#include <common.h>
-#include <brlcad_version.h>
#include <bu.h>
#include <ged.h>
Modified: brlcad/trunk/src/bwish/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/bwish/CMakeLists.txt 2020-06-06 17:20:58 UTC (rev
76044)
+++ brlcad/trunk/src/bwish/CMakeLists.txt 2020-06-06 18:45:23 UTC (rev
76045)
@@ -32,7 +32,7 @@
endif(TARGET libtermio)
BRLCAD_ADDEXEC(bwish "main.c;cmd.c;input.c" "${bwish_libs}" GUI)
- set_target_properties(bwish PROPERTIES COMPILE_DEFINITIONS "BWISH=1")
+ set_property(TARGET bwish APPEND PROPERTY COMPILE_DEFINITIONS "BWISH=1")
set_target_properties(bwish PROPERTIES FOLDER "BRL-CAD Executables")
if (TARGET itcl_pkgIndex)
Modified: brlcad/trunk/src/conv/step/ap203e2-g/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/ap203e2-g/CMakeLists.txt 2020-06-06 17:20:58 UTC
(rev 76044)
+++ brlcad/trunk/src/conv/step/ap203e2-g/CMakeLists.txt 2020-06-06 18:45:23 UTC
(rev 76045)
@@ -249,7 +249,7 @@
SC_UTILS_DLL_IMPORTS
)
list(APPEND ap203e2g_IMPORTS ${ap203e2g_IMPORTS})
- set_target_properties(step-g PROPERTIES COMPILE_DEFINITIONS
"${ap203e2g_IMPORTS}")
+ set_property(TARGET step-g APPEND PROPERTY COMPILE_DEFINITIONS
"${ap203e2g_IMPORTS}")
endif (HIDE_INTERNAL_SYMBOLS)
CMAKEFILES(CMakeLists.txt)
Modified: brlcad/trunk/src/conv/step/ap214-g/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/ap214-g/CMakeLists.txt 2020-06-06 17:20:58 UTC
(rev 76044)
+++ brlcad/trunk/src/conv/step/ap214-g/CMakeLists.txt 2020-06-06 18:45:23 UTC
(rev 76045)
@@ -250,7 +250,7 @@
SC_UTILS_DLL_IMPORTS
)
list(APPEND ap214g_IMPORTS ${ap214g_IMPORTS})
- set_target_properties(step-g PROPERTIES COMPILE_DEFINITIONS
"${ap214g_IMPORTS}")
+ set_property(TARGET step-g APPEND PROPERTY COMPILE_DEFINITIONS
"${ap214g_IMPORTS}")
endif (HIDE_INTERNAL_SYMBOLS)
CMAKEFILES(CMakeLists.txt)
Modified: brlcad/trunk/src/conv/step/ap242-g/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/ap242-g/CMakeLists.txt 2020-06-06 17:20:58 UTC
(rev 76044)
+++ brlcad/trunk/src/conv/step/ap242-g/CMakeLists.txt 2020-06-06 18:45:23 UTC
(rev 76045)
@@ -249,7 +249,7 @@
SC_UTILS_DLL_IMPORTS
)
list(APPEND ap242g_IMPORTS ${ap242g_IMPORTS})
- set_target_properties(step-g PROPERTIES COMPILE_DEFINITIONS
"${ap242g_IMPORTS}")
+ set_property(TARGET step-g APPEND PROPERTY COMPILE_DEFINITIONS
"${ap242g_IMPORTS}")
endif (HIDE_INTERNAL_SYMBOLS)
CMAKEFILES(CMakeLists.txt)
Modified: brlcad/trunk/src/conv/step/g-ap203e2/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/g-ap203e2/CMakeLists.txt 2020-06-06 17:20:58 UTC
(rev 76044)
+++ brlcad/trunk/src/conv/step/g-ap203e2/CMakeLists.txt 2020-06-06 18:45:23 UTC
(rev 76045)
@@ -57,7 +57,7 @@
SC_UTILS_DLL_IMPORTS
)
list(APPEND gap203e2_IMPORTS ${gap203e2_IMPORTS})
- set_target_properties(g-step PROPERTIES COMPILE_DEFINITIONS
"${gap203e2_IMPORTS}")
+ set_property(TARGET g-step APPEND PROPERTY COMPILE_DEFINITIONS
"${gap203e2_IMPORTS}")
endif (HIDE_INTERNAL_SYMBOLS)
set(IGNORE_FILES
Modified: brlcad/trunk/src/conv/step/g-ap214/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/g-ap214/CMakeLists.txt 2020-06-06 17:20:58 UTC
(rev 76044)
+++ brlcad/trunk/src/conv/step/g-ap214/CMakeLists.txt 2020-06-06 18:45:23 UTC
(rev 76045)
@@ -58,7 +58,7 @@
SC_UTILS_DLL_IMPORTS
)
list(APPEND gap214_IMPORTS ${gap214_IMPORTS})
- set_target_properties(g-ap214 PROPERTIES COMPILE_DEFINITIONS
"${gap214_IMPORTS}")
+ set_property(TARGET g-ap214 APPEND PROPERTY COMPILE_DEFINITIONS
"${gap214_IMPORTS}")
set_property(SOURCE
${CMAKE_CURRENT_BINARY_DIR}/AUTOMOTIVE_DESIGN/SdaiAUTOMOTIVE_DESIGN.cc
APPEND PROPERTY COMPILE_FLAGS "/bigobj")
Modified: brlcad/trunk/src/conv/step/g-ap242/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/g-ap242/CMakeLists.txt 2020-06-06 17:20:58 UTC
(rev 76044)
+++ brlcad/trunk/src/conv/step/g-ap242/CMakeLists.txt 2020-06-06 18:45:23 UTC
(rev 76045)
@@ -54,7 +54,7 @@
SC_UTILS_DLL_IMPORTS
)
list(APPEND gap242_IMPORTS ${gap242_IMPORTS})
- set_target_properties(g-ap242 PROPERTIES COMPILE_DEFINITIONS
"${gap242_IMPORTS}")
+ set_property(TARGET g-ap242 APPEND PROPERTY COMPILE_DEFINITIONS
"${gap242_IMPORTS}")
set_property(SOURCE
${CMAKE_CURRENT_BINARY_DIR}/AP242_MANAGED_MODEL_BASED_3D_ENGINEERING_MIM_LF/SdaiAP242_MANAGED_MODEL_BASED_3D_ENGINEERING_MIM_LF.cc
APPEND PROPERTY COMPILE_FLAGS "/bigobj")
Modified: brlcad/trunk/src/conv/step/g-step/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/g-step/CMakeLists.txt 2020-06-06 17:20:58 UTC
(rev 76044)
+++ brlcad/trunk/src/conv/step/g-step/CMakeLists.txt 2020-06-06 18:45:23 UTC
(rev 76045)
@@ -57,7 +57,7 @@
SC_UTILS_DLL_IMPORTS
)
list(APPEND gstep_IMPORTS ${gstep_IMPORTS})
- set_target_properties(g-step PROPERTIES COMPILE_DEFINITIONS
"${gstep_IMPORTS}")
+ set_property(TARGET g-step APPEND PROPERTY COMPILE_DEFINITIONS
"${gstep_IMPORTS}")
endif (HIDE_INTERNAL_SYMBOLS)
set(IGNORE_FILES
Modified: brlcad/trunk/src/conv/step/ifc-g/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/ifc-g/CMakeLists.txt 2020-06-06 17:20:58 UTC
(rev 76044)
+++ brlcad/trunk/src/conv/step/ifc-g/CMakeLists.txt 2020-06-06 18:45:23 UTC
(rev 76045)
@@ -42,7 +42,7 @@
SC_UTILS_DLL_IMPORTS
)
list(APPEND ifcg_IMPORTS ${ifcg_IMPORTS})
- set_target_properties(ifc-g PROPERTIES COMPILE_DEFINITIONS "${ifcg_IMPORTS}")
+ set_property(TARGET ifc-g APPEND PROPERTY COMPILE_DEFINITIONS
"${ifcg_IMPORTS}")
endif (HIDE_INTERNAL_SYMBOLS)
CMAKEFILES(CMakeLists.txt)
Modified: brlcad/trunk/src/conv/step/util/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/conv/step/util/CMakeLists.txt 2020-06-06 17:20:58 UTC
(rev 76044)
+++ brlcad/trunk/src/conv/step/util/CMakeLists.txt 2020-06-06 18:45:23 UTC
(rev 76045)
@@ -36,7 +36,7 @@
SC_UTILS_DLL_IMPORTS
)
list(APPEND list_elements_IMPORTS ${list_elements_IMPORTS})
- set_target_properties(list_elements PROPERTIES COMPILE_DEFINITIONS
"${list_elements_IMPORTS}")
+ set_property(TARGET list_elements APPEND PROPERTY COMPILE_DEFINITIONS
"${list_elements_IMPORTS}")
endif (HIDE_INTERNAL_SYMBOLS)
CMAKEFILES(CMakeLists.txt)
Modified: brlcad/trunk/src/external/Creo/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/external/Creo/CMakeLists.txt 2020-06-06 17:20:58 UTC
(rev 76044)
+++ brlcad/trunk/src/external/Creo/CMakeLists.txt 2020-06-06 18:45:23 UTC
(rev 76045)
@@ -273,6 +273,7 @@
# DLLs in place will result in silent failure of the loading step. ***
add_library(creo-brl SHARED ${creo_brl_srcs})
target_link_libraries(creo-brl ${WIN_LIBS} ${CREO_PTK_DLL_LIBS}
${BRLCAD_STATIC_LIBS})
+ set_property(TARGET creo-brl APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
install(TARGETS creo-brl
RUNTIME DESTINATION "${MDIR}/${CREO_OBJ_DIR}"
)
Modified: brlcad/trunk/src/external/Cubit/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/external/Cubit/CMakeLists.txt 2020-06-06 17:20:58 UTC
(rev 76044)
+++ brlcad/trunk/src/external/Cubit/CMakeLists.txt 2020-06-06 18:45:23 UTC
(rev 76045)
@@ -23,6 +23,7 @@
add_definitions(-DTEST_BUILD)
add_library(g-sat ${g_sat_srcs})
target_link_libraries(g-sat librt libwdb libbrep libbg libnmg libbn libbu)
+ set_property(TARGET g-sat APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
set_target_properties(g-sat PROPERTIES FOLDER "BRL-CAD Executables/Build
Only")
if(HIDE_INTERNAL_SYMBOLS)
set_property(TARGET g-sat APPEND PROPERTY COMPILE_DEFINITIONS
"BU_DLL_IMPORTS")
Modified: brlcad/trunk/src/external/Unigraphics/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/external/Unigraphics/CMakeLists.txt 2020-06-06
17:20:58 UTC (rev 76044)
+++ brlcad/trunk/src/external/Unigraphics/CMakeLists.txt 2020-06-06
18:45:23 UTC (rev 76045)
@@ -25,6 +25,7 @@
add_definitions(-DTEST_BUILD)
add_library(ug-g ${ug_g_srcs})
target_link_libraries(ug-g librt libwdb libbrep libbg libnmg libbn libbu
${TCL_LIBRARY})
+ set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
set_target_properties(ug-g PROPERTIES FOLDER "BRL-CAD Executables/Build
Only")
if(HIDE_INTERNAL_SYMBOLS)
set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"BU_DLL_IMPORTS")
Modified: brlcad/trunk/src/libbu/tests/dylib/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libbu/tests/dylib/CMakeLists.txt 2020-06-06 17:20:58 UTC
(rev 76044)
+++ brlcad/trunk/src/libbu/tests/dylib/CMakeLists.txt 2020-06-06 18:45:23 UTC
(rev 76045)
@@ -42,6 +42,7 @@
add_executable(bu_dylib run.c)
target_link_libraries(bu_dylib libdylib libbu)
+set_property(TARGET bu_dylib APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
if (HIDE_INTERNAL_SYMBOLS)
set_property(TARGET bu_dylib APPEND PROPERTY COMPILE_DEFINITIONS
BU_DYLIB_DLL_IMPORTS)
endif (HIDE_INTERNAL_SYMBOLS)
Modified: brlcad/trunk/src/remrt/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/remrt/CMakeLists.txt 2020-06-06 17:20:58 UTC (rev
76044)
+++ brlcad/trunk/src/remrt/CMakeLists.txt 2020-06-06 18:45:23 UTC (rev
76045)
@@ -15,7 +15,7 @@
BRLCAD_ADDEXEC(remrt "../rt/opt.c;ihost.c;remrt.c" "liboptical;libfb")
BRLCAD_ADDEXEC(rtsrv
"../rt/usage.cpp;../rt/view.c;../rt/do.c;../rt/heatgraph.c;../rt/opt.c;../rt/scanline.c;../rt/worker.c;rtsrv.c"
"libfb;liboptical;libpkg;libicv")
-SET_TARGET_PROPERTIES(rtsrv PROPERTIES COMPILE_DEFINITIONS "RTSRV")
+set_property(TARGET rtsrv APPEND PROPERTY COMPILE_DEFINITIONS "RTSRV")
CMAKEFILES(ihost.h protocol.h)
CMAKEFILES(CMakeLists.txt)
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
