Skip to content

Commit 8c62d89

Browse files
committedOct 7, 2023
use draco release libraries also with MSVC (like the rest of the work including osgeo4w)
1 parent b825ecc commit 8c62d89

File tree

1 file changed

+3
-25
lines changed

1 file changed

+3
-25
lines changed
 

‎cmake/FindDraco.cmake

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -48,33 +48,11 @@ FIND_LIBRARY(DRACO_LIBRARY NAMES ${DRACO_NAMES}
4848

4949
INCLUDE(FindPackageHandleStandardArgs)
5050

51-
IF(MSVC)
52-
# VisualStudio needs a debug version
53-
FIND_LIBRARY(DRACO_LIBRARY_DEBUG NAMES ${DRACO_DBG_NAMES}
54-
PATHS
55-
$ENV{DRACO_HOME}
56-
$ENV{EXTERNLIBS}/DRACO
57-
PATH_SUFFIXES lib lib64
58-
DOC "DRACO - Library (Debug)"
59-
)
51+
SET(DRACO_LIBRARIES ${DRACO_LIBRARY})
6052

61-
IF(DRACO_LIBRARY_DEBUG AND DRACO_LIBRARY)
62-
SET(DRACO_LIBRARIES optimized ${DRACO_LIBRARY} debug ${DRACO_LIBRARY_DEBUG})
63-
ENDIF(DRACO_LIBRARY_DEBUG AND DRACO_LIBRARY)
53+
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Draco DEFAULT_MSG DRACO_LIBRARY DRACO_INCLUDE_DIR)
6454

65-
FIND_PACKAGE_HANDLE_STANDARD_ARGS(DRACO DEFAULT_MSG DRACO_LIBRARY DRACO_LIBRARY_DEBUG DRACO_INCLUDE_DIR)
66-
67-
MARK_AS_ADVANCED(DRACO_LIBRARY DRACO_LIBRARY_DEBUG DRACO_INCLUDE_DIR)
68-
69-
ELSE(MSVC)
70-
# rest of the world
71-
SET(DRACO_LIBRARIES ${DRACO_LIBRARY})
72-
73-
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Draco DEFAULT_MSG DRACO_LIBRARY DRACO_INCLUDE_DIR)
74-
75-
MARK_AS_ADVANCED(DRACO_LIBRARY DRACO_INCLUDE_DIR)
76-
77-
ENDIF(MSVC)
55+
MARK_AS_ADVANCED(DRACO_LIBRARY DRACO_INCLUDE_DIR)
7856

7957
IF(DRACO_FOUND)
8058
SET(DRACO_INCLUDE_DIRS ${DRACO_INCLUDE_DIR})

0 commit comments

Comments
 (0)
Please sign in to comment.