Commit fd79794b authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

cmake: removed version from installation paths in include/ and share/

parent e68d52ac

CMakeLists.txt

+5 −4
Original line number Diff line number Diff line
@@ -18,6 +18,10 @@ project( tnl ) 


set( tnlVersion "0.1" )



# install paths relative to the cmake's prefix

set( TNL_TARGET_INCLUDE_DIRECTORY "include/TNL" )

set( TNL_TARGET_DATA_DIRECTORY "share/TNL" )



set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")



include( OptimizeForArchitecture )
@@ -362,11 +366,8 @@ if( OPTIMIZED_VECTOR_HOST_OPERATIONS STREQUAL "yes" ) 
   AddCompilerFlag( "-DOPTIMIZED_VECTOR_HOST_OPERATIONS " )

endif()



set( configDirectory \"${CMAKE_INSTALL_PREFIX}/share/tnl-${tnlVersion}/\")

set( sourceDirectory \"${PROJECT_SOURCE_DIR}/\" )

set( testsDirectory \"${PROJECT_TESTS_PATH}/\" )

CONFIGURE_FILE( "tnlConfig.h.in" "${PROJECT_BUILD_PATH}/TNL/tnlConfig.h" )

INSTALL( FILES ${PROJECT_BUILD_PATH}/TNL/tnlConfig.h DESTINATION include/tnl-${tnlVersion}/TNL )

INSTALL( FILES ${PROJECT_BUILD_PATH}/TNL/tnlConfig.h DESTINATION ${TNL_TARGET_INCLUDE_DIRECTORY} )



#Nastavime cesty k hlavickovym souborum a knihovnam

INCLUDE_DIRECTORIES( src )

examples/heat-equation/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -26,4 +26,4 @@ INSTALL( TARGETS tnl-heat-equation${debugExt} 
INSTALL( FILES tnl-run-heat-equation-eoc-test

               tnl-run-heat-equation

               ${tnl_heat_equation_SOURCES}

         DESTINATION share/tnl-${tnlVersion}/examples/heat-equation )
 
         DESTINATION ${TNL_TARGET_DATA_DIRECTORY}/examples/heat-equation )

examples/inviscid-flow/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -20,5 +20,5 @@ INSTALL( TARGETS tnl-euler${debugExt} 
        

INSTALL( FILES run-euler

               ${tnl_inviscid_flow_SOURCES}

         DESTINATION share/tnl-${tnlVersion}/examples/inviscid-flow )

         DESTINATION ${TNL_TARGET_DATA_DIRECTORY}/examples/inviscid-flow )

examples/mean-curvature-flow/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -26,4 +26,4 @@ INSTALL( FILES tnl-run-mean-curvature-flow-eoc-test 
               tnl-run-mean-curvature-flow-contour-video

               tnl-run-mean-curvature-flow-videos

               ${tnl_mean_curvature_flow_SOURCES}

         DESTINATION share/tnl-${tnlVersion}/examples/mean-curvature-flow )
 
 No newline at end of file
 
         DESTINATION ${TNL_TARGET_DATA_DIRECTORY}/examples/mean-curvature-flow )
 
 No newline at end of file

examples/narrow-band/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -19,4 +19,4 @@ INSTALL( TARGETS narrow-band${debugExt} 
         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )

        

#INSTALL( FILES ${tnl_narrow_band_SOURCES}

#         DESTINATION share/tnl-${tnlVersion}/examples/narrow-band )
 
#         DESTINATION ${TNL_TARGET_DATA_DIRECTORY}/examples/narrow-band )