Skip to content
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

fix build on x64-windows with msvc #131

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix build on x64-windows with msvc #131

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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
/build*
/test_data/*_test.xml
/test/CMakeLists.txt.user
/.vs
/out
16 changes: 4 additions & 12 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
endif()

add_definitions("/EHsc")

#############################################################
find_package(ament_cmake QUIET)
if(ament_cmake_FOUND)
Expand Down Expand Up @@ -140,11 +142,6 @@ endif()

QT5_WRAP_UI(FORMS_HEADERS ${FORMS_UI})

add_library(behavior_tree_editor SHARED
${APP_CPPS}
${FORMS_HEADERS}
)

SET(GROOT_DEPENDENCIES QtNodeEditor )

if(ament_cmake_FOUND)
Expand All @@ -159,11 +156,8 @@ if( ZMQ_FOUND )
SET(GROOT_DEPENDENCIES ${GROOT_DEPENDENCIES} zmq)
endif()

target_link_libraries(behavior_tree_editor ${GROOT_DEPENDENCIES} )


add_executable(Groot ./bt_editor/main.cpp ${RESOURCE_FILES})
target_link_libraries(Groot behavior_tree_editor )
add_executable(Groot ./bt_editor/main.cpp ${APP_CPPS} ${FORMS_HEADERS} ${RESOURCE_FILES})
target_link_libraries(Groot ${GROOT_DEPENDENCIES} )

add_subdirectory(test)

Expand All @@ -190,12 +184,10 @@ else()

endif()

INSTALL(TARGETS behavior_tree_editor LIBRARY DESTINATION ${GROOT_LIB_DESTINATION} )
INSTALL(TARGETS Groot RUNTIME DESTINATION ${GROOT_BIN_DESTINATION} )

if(ament_cmake_FOUND)
ament_export_include_directories(include)
ament_export_dependencies(${GROOT_DEPENDENCIES} ${dependencies})
ament_export_libraries(behavior_tree_editor)
ament_package()
endif()