Revision: 76147
http://sourceforge.net/p/brlcad/code/76147
Author: starseeker
Date: 2020-06-17 21:54:28 +0000 (Wed, 17 Jun 2020)
Log Message:
-----------
Merge changes from trunk - r76143 through r76146
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/misc/tools/debug2c/CMakeLists.txt
brlcad/branches/dm-fb-merge/misc/tools/env2c/CMakeLists.txt
brlcad/branches/dm-fb-merge/src/util/CMakeLists.txt
Property Changed:
----------------
brlcad/branches/dm-fb-merge/
Index: brlcad/branches/dm-fb-merge
===================================================================
--- brlcad/branches/dm-fb-merge 2020-06-16 22:15:20 UTC (rev 76146)
+++ brlcad/branches/dm-fb-merge 2020-06-17 21:54:28 UTC (rev 76147)
Property changes on: brlcad/branches/dm-fb-merge
___________________________________________________________________
Modified: svn:mergeinfo
## -8,4 +8,4 ##
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
/brlcad/branches/tcltk86:68300-75257
-/brlcad/trunk:75440-76142
\ No newline at end of property
+/brlcad/trunk:75440-76146
\ No newline at end of property
Modified: brlcad/branches/dm-fb-merge/misc/tools/debug2c/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/misc/tools/debug2c/CMakeLists.txt
2020-06-16 22:15:20 UTC (rev 76146)
+++ brlcad/branches/dm-fb-merge/misc/tools/debug2c/CMakeLists.txt
2020-06-17 21:54:28 UTC (rev 76147)
@@ -44,7 +44,14 @@
${CMAKE_CURRENT_SOURCE_DIR}
)
+include(CheckCXXCompilerFlag)
+check_cxx_compiler_flag(-O3 O3_COMPILER_FLAG)
+
add_executable(debug2c debug2c.cxx)
+if (O3_COMPILER_FLAG)
+ # If we have the O3 flag, use it
+ target_compile_options(debug2c PRIVATE "-O3")
+endif (O3_COMPILER_FLAG)
# Local Variables:
# tab-width: 8
Modified: brlcad/branches/dm-fb-merge/misc/tools/env2c/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/misc/tools/env2c/CMakeLists.txt 2020-06-16
22:15:20 UTC (rev 76146)
+++ brlcad/branches/dm-fb-merge/misc/tools/env2c/CMakeLists.txt 2020-06-17
21:54:28 UTC (rev 76147)
@@ -46,7 +46,15 @@
find_package(Threads)
+include(CheckCXXCompilerFlag)
+check_cxx_compiler_flag(-O3 O3_COMPILER_FLAG)
+
add_executable(env2c env2c.cxx)
+if (O3_COMPILER_FLAG)
+ # If we have the O3 flag, use it
+ target_compile_options(env2c PRIVATE "-O3")
+endif (O3_COMPILER_FLAG)
+
target_link_libraries(env2c ${CMAKE_THREAD_LIBS_INIT})
# Local Variables:
Modified: brlcad/branches/dm-fb-merge/src/util/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/src/util/CMakeLists.txt 2020-06-16 22:15:20 UTC
(rev 76146)
+++ brlcad/branches/dm-fb-merge/src/util/CMakeLists.txt 2020-06-17 21:54:28 UTC
(rev 76147)
@@ -67,7 +67,7 @@
BRLCAD_ADDEXEC(double-asc double-asc.c "libdm;libbu")
BRLCAD_ADDEXEC(dpix-pix dpix-pix.c libbu)
BRLCAD_ADDEXEC(gencolor gencolor.c libbu)
-BRLCAD_ADDEXEC(halftone2 halftone.c "librt;libdm;libbu")
+BRLCAD_ADDEXEC(halftone halftone.c "librt;libdm;libbu")
# This is intended to replace all of the img-img utils eventually
BRLCAD_ADDEXEC(icv icv.cpp "libicv;libbu")
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
