Skip to content

Commit

Permalink
ubuntu build and windows too - how about aving all deps?
Browse files Browse the repository at this point in the history
  • Loading branch information
mjoppich committed Jul 26, 2018
1 parent 2ba95ea commit fd856ee
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -251,12 +251,10 @@ endif()

# source_group("UI Files" FILES ${UI_FILES})

set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -static")


add_executable(${PROJECT_NAME} ${OS_BUNDLE} # Expands to WIN32 or MACOS_BUNDLE depending on OS
${bioGUI_H} ${bioGUIapp_H} ${bioGUI_SRC} ${parsinglib_SRC} ${parsinglib_H} ${parsinglib_nodes_H} ${META_FILES_TO_INCLUDE} ${RESOURCE_FILES}
${DUKTAPE}
${DUKTAPE}
)


Expand All @@ -270,11 +268,10 @@ SET_TARGET_PROPERTIES(myssleay PROPERTIES IMPORTED_LOCATION "${OPENSSL_CRYPTO_LI
#SET_TARGET_PROPERTIES(lualib PROPERTIES IMPORTED_LOCATION "${LUA_LIBRARY}")

ADD_LIBRARY(lualib STATIC IMPORTED)
SET_TARGET_PROPERTIES(lualib PROPERTIES IMPORTED_LOCATION ${LUA_LIBRARY})
SET_TARGET_PROPERTIES(lualib PROPERTIES IMPORTED_LOCATION "${LUA_LIBRARY}")

target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
TARGET_LINK_LIBRARIES(${PROJECT_NAME} mylibeay myssleay m ${CMAKE_DL_LIBS})
TARGET_LINK_LIBRARIES(${PROJECT_NAME} lualib)
TARGET_LINK_LIBRARIES(${PROJECT_NAME} mylibeay myssleay m lualib ${CMAKE_DL_LIBS})


qt5_use_modules(${PROJECT_NAME} Core Gui Widgets Network Xml XmlPatterns)
Expand Down

0 comments on commit fd856ee

Please sign in to comment.