Revision: 77280
http://sourceforge.net/p/brlcad/code/77280
Author: starseeker
Date: 2020-09-30 00:19:06 +0000 (Wed, 30 Sep 2020)
Log Message:
-----------
Fix misc/tools, rename unclear variable that pertained to both misc/tools and
src/other.
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/CMakeLists.txt
brlcad/branches/thirdparty_rework/misc/tools/CMakeLists.txt
brlcad/branches/thirdparty_rework/misc/tools/Third_Party_Exec.cmake
brlcad/branches/thirdparty_rework/src/libanalyze/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/libged/env/CMakeLists.txt
Modified: brlcad/branches/thirdparty_rework/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/CMakeLists.txt 2020-09-29 21:55:16 UTC
(rev 77279)
+++ brlcad/branches/thirdparty_rework/CMakeLists.txt 2020-09-30 00:19:06 UTC
(rev 77280)
@@ -2074,11 +2074,10 @@
endif(${BRLCAD_ENABLE_TARGETS} GREATER 2)
endif(NOT BRLCAD_ENABLE_TARGETS)
-function(SetTargetFolder targetname folder)
- if(TARGET ${targetname})
- set_target_properties(${targetname} PROPERTIES FOLDER "${folder}")
- endif(TARGET ${targetname})
-endfunction(SetTargetFolder)
+# At the start, clear the misc/tools subdirs list so repeated
+# configures will correctly add the required directories
+set(MISC_ADDED_DIRS "" CACHE STRING "initialize 3rd party sub-directories
list" FORCE)
+mark_as_advanced(MISC_ADDED_DIRS)
# Add misc/tools for tools that are used in BRL-CAD's build process
# but are not otherwise usable in BRL-CAD (due to licensing, design
@@ -2100,7 +2099,11 @@
set(IWIDGETS_VERSION "4.1.1")
CONFIG_H_APPEND(BRLCAD "#cmakedefine IWIDGETS_VERSION
\"${IWIDGETS_VERSION}\"\n")
+if(BRLCAD_ENABLE_TK)
+ CONFIG_H_APPEND(BRLCAD "#define HAVE_TK 1\n")
+endif(BRLCAD_ENABLE_TK)
+
if(BRLCAD_PRINT_MSGS)
message("***********************************************************")
message("* Stage 9 of 9 - Output and Summarize Config *")
Modified: brlcad/branches/thirdparty_rework/misc/tools/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/misc/tools/CMakeLists.txt 2020-09-29
21:55:16 UTC (rev 77279)
+++ brlcad/branches/thirdparty_rework/misc/tools/CMakeLists.txt 2020-09-30
00:19:06 UTC (rev 77280)
@@ -20,6 +20,12 @@
include("${CMAKE_CURRENT_SOURCE_DIR}/Third_Party_Exec.cmake")
+function(SetTargetFolder targetname folder)
+ if(TARGET ${targetname})
+ set_target_properties(${targetname} PROPERTIES FOLDER "${folder}")
+ endif(TARGET ${targetname})
+endfunction(SetTargetFolder)
+
# Clear all pre-defined CMake flags
CLEAR_BUILD_FLAGS()
@@ -100,6 +106,18 @@
SetTargetFolder(xslt "Third Party Libraries")
SetTargetFolder(exslt "Third Party Libraries")
+# env2c - Scanner to generate a list of environment variables used by
+# source code
+THIRD_PARTY_EXECUTABLE(env2c ENV2C env2c REQUIRED "BRLCAD_LEVEL2" NOSYS)
+SetTargetFolder(env2c "Compilation Utilities")
+DISTCLEAN(${CMAKE_CURRENT_BINARY_DIR}/env2c/Makefile)
+
+# debug2c - Scanner to generate a list of debug variables used by
+# source code
+THIRD_PARTY_EXECUTABLE(debug2c DEBUG2C debug2c REQUIRED "BRLCAD_LEVEL2" NOSYS)
+SetTargetFolder(debug2c "Compilation Utilities")
+DISTCLEAN(${CMAKE_CURRENT_BINARY_DIR}/debug2c/Makefile)
+
# inactvhdrs - utility that tries to find local headers unused by other
# source code in a file hierarchy
CMAKEFILES(inactvhdrs/inactvhdrs.cpp)
Modified: brlcad/branches/thirdparty_rework/misc/tools/Third_Party_Exec.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/misc/tools/Third_Party_Exec.cmake
2020-09-29 21:55:16 UTC (rev 77279)
+++ brlcad/branches/thirdparty_rework/misc/tools/Third_Party_Exec.cmake
2020-09-30 00:19:06 UTC (rev 77280)
@@ -225,20 +225,20 @@
# In the case of executables, it is possible that a directory may define
more than one
# executable target. If this is the case, we may have already added this
directory -
# if so, don't do it again.
- if(SRC_OTHER_ADDED_DIRS)
- list(FIND SRC_OTHER_ADDED_DIRS ${dir} ADDED_RESULT)
+ if(MISC_ADDED_DIRS)
+ list(FIND MISC_ADDED_DIRS ${dir} ADDED_RESULT)
if("${ADDED_RESULT}" STREQUAL "-1")
add_subdirectory(${dir})
- set(SRC_OTHER_ADDED_DIRS ${SRC_OTHER_ADDED_DIRS} ${dir})
- list(REMOVE_DUPLICATES SRC_OTHER_ADDED_DIRS)
- set(SRC_OTHER_ADDED_DIRS ${SRC_OTHER_ADDED_DIRS} CACHE STRING "Enabled
3rd party sub-directories" FORCE)
- mark_as_advanced(SRC_OTHER_ADDED_DIRS)
+ set(MISC_ADDED_DIRS ${MISC_ADDED_DIRS} ${dir})
+ list(REMOVE_DUPLICATES MISC_ADDED_DIRS)
+ set(MISC_ADDED_DIRS ${MISC_ADDED_DIRS} CACHE STRING "Enabled 3rd party
sub-directories" FORCE)
+ mark_as_advanced(MISC_ADDED_DIRS)
endif("${ADDED_RESULT}" STREQUAL "-1")
- else(SRC_OTHER_ADDED_DIRS)
+ else(MISC_ADDED_DIRS)
add_subdirectory(${dir})
- set(SRC_OTHER_ADDED_DIRS ${dir} CACHE STRING "Enabled 3rd party
sub-directories" FORCE)
- mark_as_advanced(SRC_OTHER_ADDED_DIRS)
- endif(SRC_OTHER_ADDED_DIRS)
+ set(MISC_ADDED_DIRS ${dir} CACHE STRING "Enabled 3rd party
sub-directories" FORCE)
+ mark_as_advanced(MISC_ADDED_DIRS)
+ endif(MISC_ADDED_DIRS)
if(CMAKE_CONFIGURATION_TYPES)
set(${varname_root}_EXECUTABLE
"${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${BIN_DIR}/${build_target}" CACHE
STRING "${varname_root}_EXECUTABLE" FORCE)
else(CMAKE_CONFIGURATION_TYPES)
Modified: brlcad/branches/thirdparty_rework/src/libanalyze/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/libanalyze/CMakeLists.txt
2020-09-29 21:55:16 UTC (rev 77279)
+++ brlcad/branches/thirdparty_rework/src/libanalyze/CMakeLists.txt
2020-09-30 00:19:06 UTC (rev 77280)
@@ -23,15 +23,6 @@
file(APPEND "${DEBUG_CMD_HDRS}" "${hdr}\n")
endforeach(hdr ${NIRT_DBG_HDRS})
-include(CheckCXXCompilerFlag)
-check_cxx_compiler_flag(-O3 O3_COMPILER_FLAG)
-
-add_executable(debug2c ../../misc/tools/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)
-
add_custom_command(OUTPUT ${DEBUG_CMD_C}
COMMAND debug2c ${DEBUG_CMD_HDRS} ${DEBUG_CMD_C}
DEPENDS debug2c
Modified: brlcad/branches/thirdparty_rework/src/libged/env/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/libged/env/CMakeLists.txt
2020-09-29 21:55:16 UTC (rev 77279)
+++ brlcad/branches/thirdparty_rework/src/libged/env/CMakeLists.txt
2020-09-30 00:19:06 UTC (rev 77280)
@@ -7,17 +7,6 @@
${GED_INCLUDE_DIRS}
)
-find_package(Threads)
-include(CheckCXXCompilerFlag)
-check_cxx_compiler_flag(-O3 O3_COMPILER_FLAG)
-
-add_executable(env2c ../../../misc/tools/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})
-
set(ENV_CMD_C "${CMAKE_CURRENT_BINARY_DIR}/env_cmd.c")
add_custom_command(OUTPUT ${ENV_CMD_C}
COMMAND env2c ${CMAKE_BINARY_DIR}/cmakefiles.cmake ${ENV_CMD_C}
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
