Skip to content

OGSMOD-7669 - CMake file Improvements #78

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
wants to merge 1 commit into from
Closed

OGSMOD-7669 - CMake file Improvements #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ if (_HVT_PROJECT_IS_TOP_LEVEL AND UNIX)
set_if_not_defined(CMAKE_MACOSX_RPATH ON "")
endif()

# Set the default build type.
set_if_not_defined(CMAKE_BUILD_TYPE "Release" "The build types")

# Enable only the typical build types.
set_if_not_defined(CMAKE_CONFIGURATION_TYPES "Debug;Release;MinSizeRel;RelWithDebInfo" "List of build types")
if (NOT "${CMAKE_BUILD_TYPE}" IN_LIST CMAKE_CONFIGURATION_TYPES)
Expand Down Expand Up @@ -93,7 +96,6 @@ set_if_not_defined(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib" "D

#---------------------------------------------------------------------------------------------------

# Enable code IDE to use folders, this will enable source_group(TREE,...)
if (PROJECT_IS_TOP_LEVEL)
# Enable code IDE to use folders, this will enable source_group(TREE,...)
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
Expand Down Expand Up @@ -140,9 +142,6 @@ option(BUILD_SHARED_LIBS "Build dynamic libraries" ON)
# Find OpenGL, which is mandatory for OpenUSD on Windows and macOS.
if (WIN32 OR (APPLE AND NOT IOS))
find_package(OpenGL REQUIRED)
if (NOT OpenGL_FOUND)
message(FATAL_ERROR "OpenGL was not found.")
endif()
endif()

get_cmake_property(_MULTI_CONFIG GENERATOR_IS_MULTI_CONFIG)
Expand Down Expand Up @@ -192,7 +191,7 @@ endif()
# Set the HVT include (public API) and source (private API) directories, for use by sub-projects.
set(_HVT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")
set(_HVT_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/source")
set(_HVT_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}")
set(_HVT_OUTPUT_DIR "${PROJECT_BINARY_DIR}")

if (ENABLE_ADSK_OPENUSD_PENDING)
# By default, set the symbol visibility to hidden (to avoid exporting private symbols by mistake).
Expand Down Expand Up @@ -307,7 +306,7 @@ message(STATUS "-------------------------------------------")
message(STATUS "Hydra Viewport Toolbox build configuration:")
message(STATUS " Platform : ${CMAKE_SYSTEM_NAME} [${CMAKE_SYSTEM}]")
if (APPLE)
EXECUTE_PROCESS( COMMAND sysctl -n machdep.cpu.brand_string OUTPUT_VARIABLE COMPUTED_ARCHITECTURE )
execute_process(COMMAND sysctl -n machdep.cpu.brand_string OUTPUT_VARIABLE COMPUTED_ARCHITECTURE)
message(STATUS " Machine architecture : ${COMPUTED_ARCHITECTURE}")
endif()
message(STATUS " CMake : ${CMAKE_VERSION}")
Expand All @@ -325,6 +324,7 @@ else()
message(STATUS " Build type : ${CMAKE_BUILD_TYPE}")
endif()
message(STATUS " Warnings as errors : ${ENABLE_WARNINGS_AS_ERRORS}")
message(STATUS " Enable unit tests : ${ENABLE_TESTS}")
message(STATUS "")
message(STATUS " OpenUSD build path : ${OPENUSD_INSTALL_PATH}")
if (_MULTI_CONFIG)
Expand Down
2 changes: 1 addition & 1 deletion test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,5 +170,5 @@ set(CMAKE_GTEST_DISCOVER_TESTS_DISCOVERY_MODE PRE_TEST)
# Register the test with CTest and allow more time to discover the tests.
gtest_discover_tests(hvt_test
DISCOVERY_TIMEOUT 30
PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
PROPERTIES WORKING_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
)