Revision: 70049 http://sourceforge.net/p/brlcad/code/70049 Author: starseeker Date: 2017-08-05 12:35:25 +0000 (Sat, 05 Aug 2017) Log Message: ----------- Now that the src/other dist files are listing all files, we can add the CMAKEFILES calls to just the BRL-CAD targets - the .dist files can assume full responsibility for src/other. Consequently, we now have one less reason to override add_library and add_executable.
Modified Paths: -------------- brlcad/trunk/CMakeLists.txt brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake Modified: brlcad/trunk/CMakeLists.txt =================================================================== --- brlcad/trunk/CMakeLists.txt 2017-08-04 02:22:43 UTC (rev 70048) +++ brlcad/trunk/CMakeLists.txt 2017-08-05 12:35:25 UTC (rev 70049) @@ -370,7 +370,6 @@ # on the lib prefix for libraries if the target name is lib<target> function(add_library name) _add_library(${name} ${ARGN}) - CMAKEFILES(${ARGN}) if(${name} MATCHES "^lib*") set_target_properties(${name} PROPERTIES PREFIX "") endif(${name} MATCHES "^lib*") @@ -388,7 +387,6 @@ # Override and wrap add_executable function(add_executable name) _add_executable(${name} ${ARGN}) - CMAKEFILES(${ARGN}) set_property(GLOBAL APPEND PROPERTY CMAKE_EXEC_TARGET_LIST ${name}) endfunction(add_executable) Modified: brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake =================================================================== --- brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2017-08-04 02:22:43 UTC (rev 70048) +++ brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2017-08-05 12:35:25 UTC (rev 70049) @@ -300,6 +300,9 @@ add_executable(${execname} ${srcslist}) endif(E_GUI) + # Let CMAKEFILES know what's going on + CMAKEFILES(${srcslist}) + # Check at compile time the standard BRL-CAD style rules VALIDATE_STYLE("${execname}" "${srcslist}") @@ -380,6 +383,9 @@ set(SUBFOLDER "/${L_FOLDER}") endif(L_FOLDER) + # Let CMAKEFILES know what's going on + CMAKEFILES(${lsrcslist} ${L_SHARED_SRCS} ${L_STATIC_SRCS}) + # If we need it, set up the OBJECT library build if(USE_OBJECT_LIBS) add_library(${libname}-obj OBJECT ${lsrcslist}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits