Revision: 76812
http://sourceforge.net/p/brlcad/code/76812
Author: starseeker
Date: 2020-08-17 02:10:56 +0000 (Mon, 17 Aug 2020)
Log Message:
-----------
Still produces a long object list - try a library
Modified Paths:
--------------
brlcad/trunk/src/other/gdal/CMakeLists.txt
brlcad/trunk/src/other/gdal/frmts/CMakeLists.txt
Modified: brlcad/trunk/src/other/gdal/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/gdal/CMakeLists.txt 2020-08-17 01:55:50 UTC (rev
76811)
+++ brlcad/trunk/src/other/gdal/CMakeLists.txt 2020-08-17 02:10:56 UTC (rev
76812)
@@ -341,7 +341,6 @@
$<TARGET_OBJECTS:gdal_mdreader_obj>
$<TARGET_OBJECTS:gdal_gcore_obj>
$<TARGET_OBJECTS:gdal_alg_obj>
- $<TARGET_OBJECTS:gdal_frmts_obj>
$<TARGET_OBJECTS:libtiff_obj>
$<TARGET_OBJECTS:libgeotiff_obj>
$<TARGET_OBJECTS:json_obj>
@@ -365,35 +364,15 @@
set(gdal_libs ${gdal_libs} ws2_32.lib kernel32.lib psapi.lib)
endif(MSVC)
-if (BUILD_SHARED_LIBS)
- add_library(gdal SHARED ${gdal_srcs})
- if(gdal_libs)
- target_link_libraries(gdal ${gdal_libs})
- endif(gdal_libs)
- install(TARGETS gdal
- RUNTIME DESTINATION ${BIN_DIR}
- LIBRARY DESTINATION ${LIB_DIR}
- ARCHIVE DESTINATION ${LIB_DIR})
-endif (BUILD_SHARED_LIBS)
+add_library(gdal SHARED ${gdal_srcs})
+target_link_libraries(gdal gdal_frmts ${gdal_libs})
+install(TARGETS gdal
+ RUNTIME DESTINATION ${BIN_DIR}
+ LIBRARY DESTINATION ${LIB_DIR}
+ ARCHIVE DESTINATION ${LIB_DIR})
-if (BUILD_STATIC_LIBS)
- add_library(gdal-static STATIC ${gdal_srcs})
- if (MSVC)
- # msvc does not append 'lib' - do it here to have consistent name
- set_target_properties(gdal-static PROPERTIES PREFIX "lib")
- else (MSVC)
- set_target_properties(gdal-static PROPERTIES OUTPUT_NAME "gdal")
- endif (MSVC)
- install(TARGETS gdal-static
- RUNTIME DESTINATION ${BIN_DIR}
- LIBRARY DESTINATION ${LIB_DIR}
- ARCHIVE DESTINATION ${LIB_DIR})
-endif (BUILD_STATIC_LIBS)
+add_subdirectory(progs)
-if (BUILD_SHARED_LIBS)
- add_subdirectory(progs)
-endif (BUILD_SHARED_LIBS)
-
# Handle Data files
install(FILES LICENSE.TXT DESTINATION ${DATA_DIR}/gdal)
file(GLOB GDAL_DATA_FILES LIST_DIRECTORIES false RELATIVE
${CMAKE_CURRENT_SOURCE_DIR} data/*)
Modified: brlcad/trunk/src/other/gdal/frmts/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/gdal/frmts/CMakeLists.txt 2020-08-17 01:55:50 UTC
(rev 76811)
+++ brlcad/trunk/src/other/gdal/frmts/CMakeLists.txt 2020-08-17 02:10:56 UTC
(rev 76812)
@@ -175,11 +175,15 @@
zmapdataset.cpp
)
-add_library(gdal_frmts_obj OBJECT ${gdal_frmt_srcs})
-set_target_properties(gdal_frmts_obj PROPERTIES FOLDER "Third Party
Libraries/GDAL")
+add_library(gdal_frmts SHARED ${gdal_frmt_srcs} $<TARGET_OBJECTS:libtiff_obj>
$<TARGET_OBJECTS:libgeotiff_obj>)
+set_target_properties(gdal_frmts PROPERTIES FOLDER "Third Party
Libraries/GDAL")
+install(TARGETS gdal_frmts
+ RUNTIME DESTINATION ${BIN_DIR}
+ LIBRARY DESTINATION ${LIB_DIR}
+ ARCHIVE DESTINATION ${LIB_DIR})
if (TARGET png)
- add_dependencies(gdal_frmts_obj png)
+ add_dependencies(gdal_frmts png)
endif (TARGET png)
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
