diff --git a/src/gfx/CMakeLists.txt b/src/gfx/CMakeLists.txt index dddf5172..03a12f82 100644 --- a/src/gfx/CMakeLists.txt +++ b/src/gfx/CMakeLists.txt @@ -105,7 +105,8 @@ if (WIN32) # add_definitions(-DGFX_EXPORTS=1) target_compile_definitions(gfx PUBLIC GFX_EXPORTS=1) else() - target_compile_options(gfx PUBLIC "-fPIC") + # target_compile_options(gfx PUBLIC "-fPIC") + set_property(TARGET gfx PROPERTY POSITION_INDEPENDENT_CODE ON) endif() target_sources(gfx diff --git a/src/libpng/CMakeLists.txt b/src/libpng/CMakeLists.txt index 12c047b3..f056683c 100644 --- a/src/libpng/CMakeLists.txt +++ b/src/libpng/CMakeLists.txt @@ -30,6 +30,6 @@ else() target_compile_options(qmpng PUBLIC "-fPIC") endif() -install(TARGETS qmpng - FILE_SET HEADERS -) +# install(TARGETS qmpng +# FILE_SET HEADERS +# ) diff --git a/src/modules/anim/CMakeLists.txt b/src/modules/anim/CMakeLists.txt index 2ce43ae4..775f530c 100644 --- a/src/modules/anim/CMakeLists.txt +++ b/src/modules/anim/CMakeLists.txt @@ -56,7 +56,7 @@ target_link_libraries(anim PRIVATE qlib gfx qsys molstr Boost::filesystem Boost: MCWRAPGEN_SCR_WRAPPERS(anim) -install(TARGETS anim - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) +# install(TARGETS anim +# RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +# LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +# ) diff --git a/src/modules/importers/CMakeLists.txt b/src/modules/importers/CMakeLists.txt index e1911330..81b0a57f 100644 --- a/src/modules/importers/CMakeLists.txt +++ b/src/modules/importers/CMakeLists.txt @@ -40,13 +40,14 @@ add_library(importers STATIC ${IMPORTERS_SRCS} ${MCWG_HEADERS}) if (WIN32) add_definitions(-DIMPORTERS_EXPORTS=1) else() - target_compile_options(importers PUBLIC "-fPIC") + # target_compile_options(importers PUBLIC "-fPIC") + set_property(TARGET importers PROPERTY POSITION_INDEPENDENT_CODE ON) endif() target_link_libraries(importers PRIVATE qlib gfx qsys molstr molvis surface symm) MCWRAPGEN_SCR_WRAPPERS(importers) -install(TARGETS importers - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) +# install(TARGETS importers +# RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +# LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +# ) diff --git a/src/modules/lwview/CMakeLists.txt b/src/modules/lwview/CMakeLists.txt index c63015f7..336aa798 100644 --- a/src/modules/lwview/CMakeLists.txt +++ b/src/modules/lwview/CMakeLists.txt @@ -37,14 +37,15 @@ add_library(lwview STATIC ${LWVIEW_SRCS} ${MCWG_HEADERS}) if (WIN32) add_definitions(-DLWVIEW_EXPORTS=1) else() - target_compile_options(lwview PUBLIC "-fPIC") + # target_compile_options(lwview PUBLIC "-fPIC") + set_target_properties(lwview PROPERTIES POSITION_INDEPENDENT_CODE ON) endif() target_link_libraries(lwview PRIVATE qlib gfx qsys molstr render) MCWRAPGEN_SCR_WRAPPERS(lwview) -install(TARGETS lwview - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) +# install(TARGETS lwview +# RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +# LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +# ) diff --git a/src/modules/mdtools/CMakeLists.txt b/src/modules/mdtools/CMakeLists.txt index e3a63bef..c51b705c 100644 --- a/src/modules/mdtools/CMakeLists.txt +++ b/src/modules/mdtools/CMakeLists.txt @@ -38,7 +38,7 @@ target_link_libraries(mdtools PRIVATE qlib gfx qsys molstr) MCWRAPGEN_SCR_WRAPPERS(mdtools) -install(TARGETS mdtools - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) +# install(TARGETS mdtools +# RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +# LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +# ) diff --git a/src/modules/molanl/CMakeLists.txt b/src/modules/molanl/CMakeLists.txt index bf969cdc..2478ef46 100644 --- a/src/modules/molanl/CMakeLists.txt +++ b/src/modules/molanl/CMakeLists.txt @@ -93,7 +93,7 @@ target_link_libraries(molanl PRIVATE qlib gfx qsys molstr) MCWRAPGEN_SCR_WRAPPERS(molanl) -install(TARGETS molanl - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) +# install(TARGETS molanl +# RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +# LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +# ) diff --git a/src/modules/molstr/CMakeLists.txt b/src/modules/molstr/CMakeLists.txt index 9192b157..adeeda01 100644 --- a/src/modules/molstr/CMakeLists.txt +++ b/src/modules/molstr/CMakeLists.txt @@ -130,7 +130,7 @@ target_link_libraries(molstr PRIVATE qlib gfx qsys Boost::filesystem Boost::thre MCWRAPGEN_SCR_WRAPPERS(molstr) -install(TARGETS molstr - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) +# install(TARGETS molstr +# RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +# LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +# ) diff --git a/src/modules/molvis/CMakeLists.txt b/src/modules/molvis/CMakeLists.txt index a1790488..65071145 100644 --- a/src/modules/molvis/CMakeLists.txt +++ b/src/modules/molvis/CMakeLists.txt @@ -95,9 +95,9 @@ target_link_libraries(molvis PRIVATE qlib gfx qsys molstr Boost::filesystem Boos MCWRAPGEN_SCR_WRAPPERS(molvis) -install(TARGETS molvis - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) +# install(TARGETS molvis +# RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +# LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +# ) install(FILES ${GLSL_SHADER_FILES} DESTINATION data/shaders) diff --git a/src/modules/rendering/CMakeLists.txt b/src/modules/rendering/CMakeLists.txt index 356e505a..9f7aca5e 100644 --- a/src/modules/rendering/CMakeLists.txt +++ b/src/modules/rendering/CMakeLists.txt @@ -52,14 +52,15 @@ add_library(render STATIC ${RENDER_SRCS} ${MCWG_HEADERS}) if (WIN32) add_definitions(-DRENDER_EXPORTS=1) else() - target_compile_options(render PUBLIC "-fPIC") + # target_compile_options(render PUBLIC "-fPIC") + set_property(TARGET render PROPERTY POSITION_INDEPENDENT_CODE ON) endif() target_link_libraries(render PRIVATE qlib gfx qsys CGAL::CGAL qmpng qmzlib Boost::filesystem) MCWRAPGEN_SCR_WRAPPERS(render) -install(TARGETS render - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) +# install(TARGETS render +# RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +# LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +# ) diff --git a/src/modules/surface/CMakeLists.txt b/src/modules/surface/CMakeLists.txt index 6b50abcd..5573dafa 100644 --- a/src/modules/surface/CMakeLists.txt +++ b/src/modules/surface/CMakeLists.txt @@ -85,7 +85,7 @@ target_link_libraries(surface PRIVATE qlib gfx qsys molstr CGAL::CGAL) MCWRAPGEN_SCR_WRAPPERS(surface) -install(TARGETS surface - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) +# install(TARGETS surface +# RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +# LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +# ) diff --git a/src/modules/symm/CMakeLists.txt b/src/modules/symm/CMakeLists.txt index 1899f229..d775bea0 100644 --- a/src/modules/symm/CMakeLists.txt +++ b/src/modules/symm/CMakeLists.txt @@ -44,7 +44,7 @@ target_link_libraries(symm PRIVATE qlib gfx qsys molstr) MCWRAPGEN_SCR_WRAPPERS(symm) -install(TARGETS symm - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) +# install(TARGETS symm +# RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +# LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +# ) diff --git a/src/modules/xtal/CMakeLists.txt b/src/modules/xtal/CMakeLists.txt index ec753144..37f134c1 100644 --- a/src/modules/xtal/CMakeLists.txt +++ b/src/modules/xtal/CMakeLists.txt @@ -99,10 +99,10 @@ target_link_libraries(xtal PRIVATE qlib gfx qsys molstr symm surface ${XTAL_LINK MCWRAPGEN_SCR_WRAPPERS(xtal) -install(TARGETS xtal - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -) +# install(TARGETS xtal +# RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +# LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +# ) IF (GLSL_SHADER_FILES) install(FILES ${GLSL_SHADER_FILES} DESTINATION data/shaders) diff --git a/src/qlib/CMakeLists.txt b/src/qlib/CMakeLists.txt index 141b72ce..ab1fe5e4 100644 --- a/src/qlib/CMakeLists.txt +++ b/src/qlib/CMakeLists.txt @@ -212,7 +212,8 @@ add_library(qlib STATIC) if (WIN32) target_compile_definitions(qlib PUBLIC QLIB_EXPORTS=1) else() - target_compile_options(qlib PUBLIC "-fPIC") + # target_compile_options(qlib PUBLIC "-fPIC") + set_property(TARGET qlib PROPERTY POSITION_INDEPENDENT_CODE ON) endif() target_sources(qlib diff --git a/src/qsys/CMakeLists.txt b/src/qsys/CMakeLists.txt index 42bfbc8e..f22a4efe 100644 --- a/src/qsys/CMakeLists.txt +++ b/src/qsys/CMakeLists.txt @@ -185,7 +185,8 @@ if (WIN32) # add_definitions(-DQSYS_EXPORTS=1) target_compile_definitions(qsys PUBLIC QSYS_EXPORTS=1) else() - target_compile_options(qsys PUBLIC "-fPIC") + # target_compile_options(qsys PUBLIC "-fPIC") + set_property(TARGET qsys PROPERTY POSITION_INDEPENDENT_CODE ON) endif() target_compile_definitions(qsys PUBLIC NO_SCRIPT=1) diff --git a/src/sysdep/CMakeLists.txt b/src/sysdep/CMakeLists.txt index 539343c4..e245faeb 100644 --- a/src/sysdep/CMakeLists.txt +++ b/src/sysdep/CMakeLists.txt @@ -101,7 +101,8 @@ target_include_directories( if (WIN32) target_compile_definitions(sysdep PUBLIC SYSDEP_EXPORTS=1) else() - target_compile_options(sysdep PUBLIC "-fPIC") + # target_compile_options(sysdep PUBLIC "-fPIC") + set_property(TARGET sysdep PROPERTY POSITION_INDEPENDENT_CODE ON) endif() # message(STATUS "SYSDEP_LINK_LIBRARIES: ${SYSDEP_LINK_LIBRARIES}") diff --git a/src/zlib/CMakeLists.txt b/src/zlib/CMakeLists.txt index 07863be7..ebcad9d0 100644 --- a/src/zlib/CMakeLists.txt +++ b/src/zlib/CMakeLists.txt @@ -30,6 +30,6 @@ else() target_compile_options(qmzlib PUBLIC "-fPIC") endif() -install(TARGETS qmzlib - FILE_SET HEADERS -) +# install(TARGETS qmzlib +# FILE_SET HEADERS +# )