Update CMakeStructure to be compatible with ROOT 6.18

CMakeLists.txt

@@ -24,37 +24,56 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/inc)
 
 set(SRCS
-    TJAlienCollection.cxx
-    TJAlienCredentials.cxx
-    TJAlien.cxx
-    TJAlienDirectory.cxx
-    TJAlienDNSResolver.cxx
-    TJAlienFile.cxx
-    TJAlienJDL.cxx
-    TJAlienJob.cxx
-    TJAlienJobStatus.cxx
-    TJAlienJobStatusList.cxx
-    TJAlienMasterJob.cxx
-    TJAlienMasterJobStatus.cxx
-    TJAlienResult.cxx
-    TJAlienResultRewriter.cxx
-    TJAlienSAXHandler.cxx
-    TJAlienSystem.cxx
-    TJClientFile.cxx
-    TJAlienConnectionManager.cxx
+    src/TJAlienCollection.cxx
+    src/TJAlienCredentials.cxx
+    src/TJAlien.cxx
+    src/TJAlienDirectory.cxx
+    src/TJAlienDNSResolver.cxx
+    src/TJAlienFile.cxx
+    src/TJAlienJDL.cxx
+    src/TJAlienJob.cxx
+    src/TJAlienJobStatus.cxx
+    src/TJAlienJobStatusList.cxx
+    src/TJAlienMasterJob.cxx
+    src/TJAlienMasterJobStatus.cxx
+    src/TJAlienResult.cxx
+    src/TJAlienResultRewriter.cxx
+    src/TJAlienSAXHandler.cxx
+    src/TJAlienSystem.cxx
+    src/TJClientFile.cxx
+    src/TJAlienConnectionManager.cxx
     )
-string(REGEX REPLACE "T" "src/T" SRCS "${SRCS}")
 
-string(REPLACE ".cxx" ".h" HDRS "${SRCS}")
-string(REPLACE "src" "inc" HDRS "${HDRS}")
-set(HDRS ${HDRS} "inc/TAliceCollection.h" "inc/TAliceFile.h" "inc/TAliceJobStatus.h")
+set(HDRS
+    TJAlienCollection.h
+    TJAlienCredentials.h
+    TJAlien.h
+    TJAlienDirectory.h
+    TJAlienDNSResolver.h
+    TJAlienFile.h
+    TJAlienJDL.h
+    TJAlienJob.h
+    TJAlienJobStatus.h
+    TJAlienJobStatusList.h
+    TJAlienMasterJob.h
+    TJAlienMasterJobStatus.h
+    TJAlienResult.h
+    TJAlienResultRewriter.h
+    TJAlienSAXHandler.h
+    TJAlienSystem.h
+    TJClientFile.h
+    TJAlienConnectionManager.h
+    TAliceCollection.h
+    TAliceFile.h
+    TAliceJobStatus.h
+    )
 
-ROOT_GENERATE_DICTIONARY(G__${LIBNAME} "${HDRS}" LINKDEF LinkDef.h)
+ROOT_GENERATE_DICTIONARY(G__${LIBNAME} "${HDRS}" LINKDEF LinkDef.h OPTIONS -Iinc)
 add_library(${LIBNAME} SHARED "${SRCS}" G__${LIBNAME}.cxx)
 target_link_libraries(${LIBNAME} ${ROOT_LIBRARIES} json-c websockets ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES})
 
 install(TARGETS ${LIBNAME} LIBRARY DESTINATION lib)
 install(FILES ${PROJECT_BINARY_DIR}/lib${LIBNAME}.rootmap DESTINATION lib)
 install(FILES ${PROJECT_BINARY_DIR}/lib${LIBNAME}_rdict.pcm DESTINATION lib)
-install(FILES ${HDRS} DESTINATION inc)
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/inc/ DESTINATION include)
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/etc/plugins DESTINATION etc)