Skip to content

Commit

Permalink
Hmm. Getting a mismatch detected error when building ged-bot on Windo…
Browse files Browse the repository at this point in the history
…ws - looks like MT_StaticRelease from geogram and MD_DynamicRelease in bot.obj. Doubt it's this simple (in fact it is more likely to cascade into things like dll export issues), but try making add_library explicitly SHARED.
  • Loading branch information
starseeker committed Jan 27, 2024
1 parent e28d1e8 commit 8b5308a
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
2 changes: 1 addition & 1 deletion geogram/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if (ENABLE_GEOGRAM)
ExternalProject_Add(GEOGRAM_BLD
URL "${CMAKE_CURRENT_SOURCE_DIR}/geogram"
BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
#PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/geogram.patch
PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/geogram.patch
CMAKE_ARGS
${BUILD_TYPE_SPECIFIER}
-DBIN_DIR=${BIN_DIR}
Expand Down
12 changes: 12 additions & 0 deletions geogram/geogram.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff -Naur geogram/src/lib/geogram/CMakeLists.txt GEOGRAM_BLD/src/lib/geogram/CMakeLists.txt
--- geogram/src/lib/geogram/CMakeLists.txt 2024-01-27 01:03:38.771848391 -0500
+++ GEOGRAM_BLD/src/lib/geogram/CMakeLists.txt 2024-01-27 01:04:09.835359301 -0500
@@ -45,7 +45,7 @@

include_directories(${PROJECT_BINARY_DIR}/src/lib)

-add_library(geogram ${SOURCES} $<TARGET_OBJECTS:geogram_third_party>)
+add_library(geogram SHARED ${SOURCES} $<TARGET_OBJECTS:geogram_third_party>)

target_include_directories(geogram PRIVATE
${PROJECT_SOURCE_DIR}/src/lib/geogram/third_party/amgcl

0 comments on commit 8b5308a

Please sign in to comment.