Fixing CMake build

Author: tsengia

CMakeLists.txt

@@ -1,40 +1,47 @@
 cmake_minimum_required(VERSION 3.0)
 
 project(jsgfkitxx
-	VERSION 1.0
-	LANGUAGES CXX)
+	VERSION 1.1
+	LANGUAGES CXX
+)
+
+set(JSGF_KIT_XX_SOURCES 
+    src/grammar.cpp 
+    src/expansion.cpp 
+    src/rule.cpp 
+    src/matchinfo.cpp 
+    src/matchresult.cpp 
+    src/tag.cpp                
+    src/unparsedsection.cpp 
+    src/kleenestar.cpp 
+    src/plusoperator.cpp            
+    src/optionalgrouping.cpp 
+    src/requiredgrouping.cpp 
+    src/sequence.cpp     
+    src/alternativeset.cpp 
+    src/token.cpp 
+    src/rulereference.cpp
+)
+
+add_library(jsgfkitxx STATIC ${JSGF_KIT_XX_SOURCES})
+target_include_directories(jsgfkitxx PUBLIC ${PROJECT_SOURCE_DIR}/include)
 
 include(GNUInstallDirs)
 
-option(ENABLE_DEBUG "Enables debugging messages" OFF)
-
-set(KIT_SOURCES src/grammar.cpp src/expansion.cpp src/rule.cpp src/matchinfo.cpp src/matchresult.cpp src/tag.cpp
-                        src/unparsedsection.cpp src/kleenestar.cpp src/plusoperator.cpp
-                        src/optionalgrouping.cpp src/requiredgrouping.cpp src/sequence.cpp
-                        src/alternativeset.cpp src/token.cpp src/rulereference.cpp)
-
-set(KIT_HEADERS include/rule.h include/expansion.h include/grammar.h
-                  include/unparsedsection.h include/kleenestar.h
-                  include/alternativeset.h include/token.h include/tag.h include/matchinfo.h
-                  include/matchresult.h include/sequence.h include/plusoperator.h include/requiredgrouping.h
-                  include/optionalgrouping.h include/rulereference.h)
-
-add_library(jsgfkit STATIC ${KIT_SOURCES})
-target_include_directories(jsgfkit PUBLIC ${PROJECT_BINARY_DIR}/include)
-
 #Set variables for the .pc file
 set(prefix "${CMAKE_INSTALL_PREFIX}")
 set(exec_prefix "${CMAKE_INSTALL_PREFIX}")
 set(libdir "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
 set(includedir "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
-configure_file(jsgfkit.pc.in jsgfkit.pc @ONLY)
+configure_file(jsgfkitxx.pc.in jsgfkitxx.pc @ONLY)
 
-install(TARGETS jsgfkit
-	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(TARGETS jsgfkitxx
+	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
 
-install(FILES ${KIT_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jsgfkit)
+install(FILES ${KIT_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jsgfkitxx)
 
-install(FILES jsgfkit.pc DESTINATION ${CMAKE_INSTALL_DATAROOT_DIR}/pkgconfig)
+install(FILES jsgfkitxx.pc DESTINATION ${CMAKE_INSTALL_DATAROOT_DIR}/pkgconfig)
 
 # Build Tests
 enable_testing ()

jsgfkit.pc.in renamed to jsgfkitxx.pc.in

@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: jsgfkit
+Name: jsgfkitxx
 Description: A C++ library for parsing and manipulating Java Speech Grammar Format files.
 Version: 1.0
-Cflags: -I${includedir}/jsgfkit
-Libs: -L${libdir} -ljsgfkit
+Cflags: -I${includedir}/jsgfkitxx
+Libs: -L${libdir} -ljsgfkitxx

test/CMakeLists.txt

@@ -1,9 +1,13 @@
 
-add_executable(parsetest ParseAndOutputJSGF.cpp)
-target_link_libraries(parsetest jsgfkit)
-target_include_directories(jsgfkit PUBLIC ${PROJECT_BINARY_DIR}/include)
+add_executable(parse-test ParseAndOutputJSGF.cpp)
+target_link_libraries(parse-test PRIVATE jsgfkitxx)
+target_include_directories(parse-test
+    PUBLIC ${PROJECT_BINARY_DIR}/include
+)
 
-add_executable(expansiontypetest ExpansionTypeTest.cpp)
-target_link_libraries(expansiontypetest jsgfkit)
-target_include_directories(jsgfkit PUBLIC ${PROJECT_BINARY_DIR}/include)
+add_executable(expansion-type-test ExpansionTypeTest.cpp)
+target_link_libraries(expansion-type-test PRIVATE jsgfkitxx)
+target_include_directories(expansion-type-test 
+    PUBLIC ${PROJECT_BINARY_DIR}/include
+)