Skip to content

Fixes (?) to add_debug_variants #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
aothms wants to merge 2 commits into from
Closed

Fixes (?) to add_debug_variants #201

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44683a6
Fixes (?) to add_debug_variants
aothms Apr 3, 2017
e133b29
Fixes to "fixes (?) to add_debug_variants"
aothms Apr 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,23 +130,23 @@ function(add_debug_variants NAME LIBRARIES POSTFIX)
set(LIBRARIES_STR "${LIBRARIES}")
# the result, "optimized <lib> debug <lib>", needs to be a list instead of a string
foreach(lib ${LIBRARIES_STR})
list(APPEND LIBRARIES optimized)
list(APPEND LIBS optimized)
if ("${lib}" MATCHES ".lib")
string(REPLACE ".lib" "" lib ${lib})
list(APPEND LIBRARIES ${lib}.lib)
list(APPEND LIBS ${lib}.lib)
else()
list(APPEND LIBRARIES ${lib})
list(APPEND LIBS ${lib})
endif()

list(APPEND LIBRARIES debug)
list(APPEND LIBS debug)
if ("${lib}" MATCHES ".lib")
string(REPLACE ".lib" "" lib ${lib})
list(APPEND LIBRARIES ${lib}${POSTFIX}.lib)
list(APPEND LIBS ${lib}${POSTFIX}.lib)
else()
list(APPEND LIBRARIES ${lib}${POSTFIX})
list(APPEND LIBS ${lib}${POSTFIX})
endif()
endforeach()
set(${NAME} ${LIBRARIES} PARENT_SCOPE)
set(${NAME} ${LIBS} PARENT_SCOPE)
endfunction()

# Find Open CASCADE
Expand Down Expand Up @@ -187,15 +187,22 @@ ELSE()
MESSAGE(FATAL_ERROR "Unable to find library files, aborting")
ENDIF()

if(MSVC)
# Strip off the debug post-fix, as it will be added back in add_debug_variants()
string(REPLACE TKerneld TKernel libTKernel "${libTKernel}")
endif()

# Use the found libTKernel as a template for all other OCC libraries
foreach(lib ${OPENCASCADE_LIBRARY_NAMES})
string(REPLACE TKernel "${lib}" lib_path "${libTKernel}")
list(APPEND OPENCASCADE_LIBRARIES "${lib_path}")
list(APPEND OPENCASCADE_LIBRARIES_RELEASE "${lib_path}")
endforeach()

if(MSVC)
add_definitions(-DHAVE_NO_DLL)
add_debug_variants(OPENCASCADE_LIBRARIES "${OPENCASCADE_LIBRARIES}" d)
add_debug_variants(OPENCASCADE_LIBRARIES "${OPENCASCADE_LIBRARIES_RELEASE}" d)
else()
set(OPENCASCADE_LIBRARIES ${OPENCASCADE_LIBRARIES_RELEASE})
endif()

IF(UNICODE_SUPPORT)
Expand Down