Revision: 69993 http://sourceforge.net/p/brlcad/code/69993 Author: starseeker Date: 2017-07-24 19:44:57 +0000 (Mon, 24 Jul 2017) Log Message: ----------- without multispectral the build works, although the shared library has a lot of unresolved symbols... may need to OBJECT-ify some of the src/other builds and hook them in...
Modified Paths: -------------- brlcad/trunk/src/CMakeLists.txt Modified: brlcad/trunk/src/CMakeLists.txt =================================================================== --- brlcad/trunk/src/CMakeLists.txt 2017-07-24 19:04:01 UTC (rev 69992) +++ brlcad/trunk/src/CMakeLists.txt 2017-07-24 19:44:57 UTC (rev 69993) @@ -155,16 +155,21 @@ set(wl 1) math(EXPR cml "${current_level} + 1") while(${wl} LESS ${cml}) - message("libs: ${level_${wl}_dirs}") foreach(llib ${level_${wl}_dirs}) - if(TARGET ${llib}) + if(TARGET ${llib} AND NOT "${llib}" STREQUAL "libmultispectral") set(libbrlcad_objs ${libbrlcad_objs} $<TARGET_OBJECTS:${llib}-obj>) - endif(TARGET ${llib}) + endif(TARGET ${llib} AND NOT "${llib}" STREQUAL "libmultispectral") endforeach(llib ${level_${wl}_dirs}) math(EXPR wl "${wl} + 1") endwhile(${wl} LESS ${cml}) - add_library(libbrlcad-shared-${current_level} SHARED ${libbrlcad_objs}) - add_library(libbrlcad-static-${current_level} STATIC ${libbrlcad_objs}) + if("${current_level}" EQUAL 1) + add_library(libbrlcad-core SHARED ${libbrlcad_objs}) + add_library(libbrlcad-core-static STATIC ${libbrlcad_objs}) + endif("${current_level}" EQUAL 1) + if("${current_level}" EQUAL 2) + add_library(libbrlcad SHARED ${libbrlcad_objs}) + add_library(libbrlcad-static STATIC ${libbrlcad_objs}) + endif("${current_level}" EQUAL 2) math(EXPR current_level "${current_level} + 1") endwhile(${current_level} LESS ${HIGHEST_TARGET_LEVEL}) endif(BRLCAD_BUILD_LIBBRLCAD AND USE_OBJECT_LIBS) 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