Skip to content

Commit

Permalink
Fix build errors
Browse files Browse the repository at this point in the history
  • Loading branch information
dtarakanov1 committed Sep 18, 2018
1 parent 7104360 commit 6b8c8e8
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
14 changes: 14 additions & 0 deletions BaikalDataGenerator/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ target_include_directories(BaikalDataGeneratorLib
)

target_link_libraries(BaikalDataGeneratorLib PRIVATE RadeonProRender64 Baikal BaikalIO)
if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
target_link_libraries(BaikalDataGeneratorLib PRIVATE stdc++fs)
endif()
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
target_link_libraries(BaikalDataGeneratorLib PRIVATE c++experimental)
endif ()

set_target_properties(BaikalDataGeneratorLib
PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY ${Baikal_SOURCE_DIR}/BaikalDataGeneratorLib)
Expand All @@ -41,10 +47,12 @@ endif ()
# Application

set(DATAGENERATOR_APP_SOURCES
Source/app_config.h
Source/cmd_line_parser.h
Source/cmd_line_parser.cpp
Source/devices.h
Source/devices.cpp
Source/filesystem.h
Source/object_loader.h
Source/object_loader.cpp
Source/logging.h
Expand All @@ -62,6 +70,12 @@ target_include_directories(BaikalDataGenerator
)

target_link_libraries(BaikalDataGenerator PRIVATE BaikalDataGeneratorLib RadeonProRender64 Baikal)
if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
target_link_libraries(BaikalDataGenerator PRIVATE stdc++fs)
endif()
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
target_link_libraries(BaikalDataGenerator PRIVATE c++experimental)
endif ()

set_target_properties(BaikalDataGenerator
PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY ${Baikal_SOURCE_DIR}/BaikalDataGenerator)
Expand Down
2 changes: 1 addition & 1 deletion BaikalDataGenerator/Source/object_loader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
********************************************************************/

#include "ObjectLoader.h"
#include "object_loader.h"

#include "Rpr/RadeonProRender.h"
#include "Rpr/WrapObject/Materials/MaterialObject.h"
Expand Down

0 comments on commit 6b8c8e8

Please sign in to comment.